From d1f8cca0ac0bd444eac662ed270d812dff060a49 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Tue, 24 Oct 2017 17:27:00 +0100
Subject: [PATCH] whiltelist scipy for pylint, split up style stage a bit so it
is easier to read
---
.gitlab-ci.yml | 24 ++++++++++--------------
.pylintrc | 2 +-
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 053eabf0a..2142bcad0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,24 +244,20 @@ variables:
- $INSTALL_WX
- # All other deps can be installed as
- # normal. scipy is required by nibabel,
- # but not listed in its requirements.
- # We install test dependencies through
- # pip, because if we let setuptools do
- # it, it will build/install everything
- # from source, rather than using wheels.
+ # All other deps can be installed as normal.
+ # We install test dependenciesd through pip,
+ # because if we let setuptools do it, it
+ # will build/install everything from source,
+ # rather than using wheels.
- pip install -r requirements.txt
- pip install sphinx sphinx-rtd-theme
- pip install pytest pytest-cov pytest-html pytest-runner mock coverage
- # style test
- - if [ "$TEST_STYLE"x != "x" ]; then
- pip install pylint flake8;
- flake8 fsl || true;
- pylint --output-format=colorized fsl || true;
- exit 0;
- fi
+ # style stage
+ - if [ "$TEST_STYLE"x != "x" ]; then pip install pylint flake8; fi;
+ - if [ "$TEST_STYLE"x != "x" ]; then flake8 fsl || true; fi;
+ - if [ "$TEST_STYLE"x != "x" ]; then pylint --output-format=colorized fsl || true; fi;
+ - if [ "$TEST_STYLE"x != "x" ]; then exit 0; fi
# We need the FSL atlases for the atlas
# tests, and need $FSLDIR to be defined
diff --git a/.pylintrc b/.pylintrc
index 32bf347b0..4c08b085d 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -3,7 +3,7 @@
# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code
-extension-pkg-whitelist=numpy,wx
+extension-pkg-whitelist=numpy,wx,scipy
# Add files or directories to the blacklist. They should be base names, not
# paths.
--
GitLab