FIX: Add tests

mne-tools · Sep 1, 2017 · 7dff059 · 7dff059
1 parent a3869a6
commit 7dff059
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 46 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,16 +39,14 @@ matrix:
 
         # Py3k + non-default stim channel first half
         - os: linux
-          env: PYTHON_VERSION=3.6 TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
-               CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels nose pytest"
-               PIP_DEPENDENCIES="nitime joblib nibabel codecov nose-timer pytest-sugar pytest-cov pytest-attrib"
+          env: TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
+               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: PYTHON_VERSION=3.6 TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
-               CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels nose pytest"
-               PIP_DEPENDENCIES="nitime joblib nibabel codecov nose-timer pytest-sugar pytest-cov pytest-attrib"
+          env: TEST_LOCATION=install MNE_STIM_CHANNEL=STI101
+               CONDA_ENVIRONMENT="ennvironment.yml"
                MNE_DIRS="minimum_norm preprocessing realtime simulation stats time_frequency viz"
                OPTION=""
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,8 +1,7 @@
 environment:
   global:
       PYTHON: "C:\\conda"
-      CONDA_DEPENDENCIES: "setuptools numpy scipy matplotlib scikit-learn mayavi pandas h5py PIL pyside pytest"
-      PIP_DEPENDENCIES: "git+git://github.com/nipy/PySurfer.git nibabel nitime nose-timer nose-faulthandler pytest-attrib"
+      CONDA_ENVIRONMENT: "environment.yml"
   matrix:
       - PYTHON_VERSION: "2.7"
         PYTHON_ARCH: "64"

diff --git a/environment.yml b/environment.yml
@@ -2,23 +2,26 @@ name: mne
 channels:
 - defaults
 - conda-forge
-- menpo  # for mayavi
+- clinicalgraphics  # for vtk
 dependencies:
 - python=3.6
 - pip
 - mkl
 - numpy
 - scipy
 - matplotlib
+- pyqt=4.11.4
+- qt=4.8.7
 - pandas
 - scikit-learn
 - jupyter
 - ipython
 - statsmodels
 - h5py
+- sphinx
 - vtk
-- mayavi
 - pip:
+  - mayavi
   - "git+https://github.com/nipy/PySurfer.git"
   - nibabel
   - nilearn
@@ -27,7 +30,6 @@ dependencies:
   - nose
   - pytest
   - pytest-cov
-  - sphinx
   - sphinx_bootstrap_theme
   - numpydoc
   - sphinx-gallery
diff --git a/environment_osx.yml b/environment_osx.yml