FIX: Clean up tests

mne-tools · Sep 1, 2017 · ad9c540 · ad9c540
1 parent 098824c
commit ad9c540
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,84 +7,58 @@ cache:
   - $HOME/.cache/pip
   - $HOME/.ccache
 env:
+    # TRAVIS_PYTHON_VERSION is only needed for neo's setup.py
     global: PYTHON_VERSION=2.7 DISPLAY=:99.0 MNE_LOGGING_LEVEL=warning TEST_LOCATION=src
+            SPLIT_0=". beamformer channels commands connectivity datasets decoding forward gui inverse_sparse io"
+            SPLIT_1="minimum_norm preprocessing realtime simulation stats time_frequency viz"
+            TRAVIS_PYTHON_VERSION=3.6
+os: linux
 
 matrix:
     include:
-        # Full (Linux, 2.7) first half
-        - os: linux
-          env: CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi pytest"
-               PIP_DEPENDENCIES="git+git://github.com/nipy/PySurfer.git nitime faulthandler joblib nibabel codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS=". beamformer channels commands connectivity datasets decoding forward gui inverse_sparse io"
-               OPTION=""
-        # Full (Linux, 2.7) second half
-        - os: linux
-          env: CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi pytest"
-               PIP_DEPENDENCIES="git+git://github.com/nipy/PySurfer.git nitime faulthandler joblib nibabel codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS="minimum_norm preprocessing realtime simulation stats time_frequency viz"
-               OPTION=""
+        # 3.6 + non-default stim channel
+        - env: SPLIT=0 TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
+               CONDA_ENVIRONMENT="environment.yml"
+        - env: SPLIT=1 TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
+               CONDA_ENVIRONMENT="environment.yml"
 
-        # OSX first half
+        # OSX
         - os: osx
-          env: CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi pytest"
-               PIP_DEPENDENCIES="git+git://github.com/nipy/PySurfer.git nitime faulthandler joblib nibabel codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS=". beamformer channels commands connectivity datasets decoding forward gui inverse_sparse io"
-               OPTION=""
-        # OSX second half
+          env: SPLIT=0
+               CONDA_ENVIRONMENT="environment.yml"
         - os: osx
-          env: CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi pytest"
-               PIP_DEPENDENCIES="git+git://github.com/nipy/PySurfer.git nitime faulthandler joblib nibabel codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS="minimum_norm preprocessing realtime simulation stats time_frequency viz"
-               OPTION=""
-
-        # Py3k + non-default stim channel first half
-        - os: linux
-          env: TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
+          env: SPLIT=1
                CONDA_ENVIRONMENT="environment.yml"
-               MNE_DIRS=". beamformer channels commands connectivity datasets decoding forward gui inverse_sparse io"
-               OPTION=""
-        # Py3k + non-default stim channel second half
-        - os: linux
-          env: TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
-               CONDA_ENVIRONMENT="ennvironment.yml"
-               MNE_DIRS="minimum_norm preprocessing realtime simulation stats time_frequency viz"
-               OPTION=""
 
-        # Old dependencies first half
-        - os: linux
-          env: CONDA_DEPENDENCIES="numpy=1.8 scipy=0.12 matplotlib=1.3 pandas=0.12 scikit-learn=0.14 pytest"
-               PIP_DEPENDENCIES="codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS=". beamformer channels commands connectivity datasets decoding forward gui inverse_sparse io"
-               OPTION=""
-        # Old dependencies second half
-        - os: linux
-          env: CONDA_DEPENDENCIES="numpy=1.8 scipy=0.12 matplotlib=1.3 pandas=0.12 scikit-learn=0.14 pytest"
-               PIP_DEPENDENCIES="codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS="minimum_norm preprocessing realtime simulation stats time_frequency viz"
-               OPTION=""
+        # 2.7
+        - env: SPLIT=0
+               CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi pytest"
+               PIP_DEPENDENCIES="git+git://github.com/nipy/PySurfer.git nitime faulthandler joblib nibabel codecov pytest-sugar pytest-cov pytest-attrib"
+        - env: SPLIT=1
+               CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi pytest"
+               PIP_DEPENDENCIES="git+git://github.com/nipy/PySurfer.git nitime faulthandler joblib nibabel codecov pytest-sugar pytest-cov pytest-attrib"
+
+        # Oldest supported dependencies
+        - env: SPLIT=0
+               CONDA_DEPENDENCIES="numpy=1.8 scipy=0.12 matplotlib=1.3 pandas=0.12 scikit-learn=0.14 pytest"
+               PIP_DEPENDENCIES="codecov pytest-sugar pytest-cov pytest-attrib"
+        - env: SPLIT=1
+               CONDA_DEPENDENCIES="numpy=1.8 scipy=0.12 matplotlib=1.3 pandas=0.12 scikit-learn=0.14 pytest"
+               PIP_DEPENDENCIES="codecov pytest-sugar pytest-cov pytest-attrib"
 
         # Minimal first half
-        - os: linux
-          env: DEPS=minimial
+        - env: SPLIT=0 DEPS=minimial
                CONDA_DEPENDENCIES="numpy scipy matplotlib pytest"
-               PIP_DEPENDENCIES="codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS=". beamformer channels commands connectivity datasets decoding forward gui inverse_sparse io"
-               OPTION=""
-        # Minimal second half
-        - os: linux
-          env: DEPS=minimial
+               PIP_DEPENDENCIES="codecov pytest-sugar pytest-cov pytest-attrib"
+        - env: SPLIT=1 DEPS=minimial
                CONDA_DEPENDENCIES="numpy scipy matplotlib pytest"
-               PIP_DEPENDENCIES="codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS="minimum_norm preprocessing realtime simulation stats time_frequency viz"
-               OPTION=""
+               PIP_DEPENDENCIES="codecov pytest-sugar pytest-cov pytest-attrib"
 
         # No data + style testing
-        - os: linux
-          env: DEPS=nodata MNE_DONTWRITE_HOME=true MNE_FORCE_SERIAL=true MNE_SKIP_NETWORK_TEST=1
+        - env: DEPS=nodata MNE_DONTWRITE_HOME=true MNE_FORCE_SERIAL=true MNE_SKIP_NETWORK_TEST=1
+               OPTION="--doctest-ignore-import-errors"
                CONDA_DEPENDENCIES="numpy scipy matplotlib sphinx pytest"
                PIP_DEPENDENCIES="flake8 numpydoc codespell git+git://github.com/PyCQA/pydocstyle.git codecov nose-timer nose-faulthandler check-manifest pytest-sugar pytest-cov pytest-attrib"
-               MNE_DIRS=""
-               OPTION="--doctest-ignore-import-errors"
 
 # Setup anaconda
 before_install:
@@ -107,6 +81,13 @@ before_install:
     - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
         /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render -noreset;
       fi;
+    - if [ "${SPLIT}" == "0" ]; then
+        MNE_DIRS=${SPLIT_0};
+      elif [ "${SPLIT}" == "1" ]; then
+        MNE_DIRS=${SPLIT_1};
+      else
+        MNE_DIRS="";
+      fi
 
 install:
     # Suppress the parallel outputs for logging cleanliness

diff --git a/environment.yml b/environment.yml
@@ -31,6 +31,7 @@ dependencies:
   - nose
   - pytest
   - pytest-cov
+  - pytest-attrib
   - sphinx_bootstrap_theme
   - numpydoc
   - sphinx-gallery