Skip to content

Commit faefe1e

Browse files
authored
FIX: Use pip for vtk on windows (#5845)
1 parent 7331ad6 commit faefe1e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

appveyor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ image: Visual Studio 2013
33
environment:
44
global:
55
PYTHON: "C:\\conda"
6-
CONDA_ENVIRONMENT: "environment.yml"
7-
PIP_DEPENDENCIES: "codecov pytest-faulthandler pytest-sugar pytest-timeout"
6+
# CONDA_ENVIRONMENT: "environment.yml"
7+
CONDA_DEPENDENCIES: "python>=3.6 pip mkl numpy scipy matplotlib cython pyqt>=5.9 pandas xlrd scikit-learn h5py pillow statsmodels jupyter pytest pytest-cov joblib psutil numpydoc flake8 spyder numexpr traits>=4.6.0 pyface>=6 traitsui>=6 testpath<0.4"
8+
PIP_DEPENDENCIES: "codecov pytest-sugar pytest-timeout vtk https://api.github.com/repos/enthought/mayavi/zipball/b3fc35218dda9776d8f1a407663bfb49783dca12 PySurfer[save_movie] dipy --only-binary dipy nibabel nilearn neo pytest-faulthandler pytest-mock pydocstyle codespell python-picard"
89
matrix:
910
- PYTHON_VERSION: "3.6"
1011
PYTHON_ARCH: "64"
@@ -14,7 +15,7 @@ install:
1415
- "powershell ci-helpers/appveyor/install-miniconda.ps1"
1516
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
1617
- "activate test"
17-
- "pip uninstall -yq mne"
18+
# "pip uninstall -yq mne"
1819
- "python setup.py develop"
1920
- "python -c \"import mne; print(mne.sys_info())\""
2021
- "SET MNE_FORCE_SERIAL=true" # otherwise joblib will bomb

environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ dependencies:
2020
- jupyter
2121
- pytest
2222
- pytest-cov
23+
- pytest-mock
24+
- pytest-timeout
2325
- joblib
2426
- psutil
2527
- numpydoc
@@ -39,7 +41,6 @@ dependencies:
3941
- nilearn
4042
- neo
4143
- pytest-faulthandler
42-
- pytest-mock
4344
- pydocstyle
4445
- codespell
4546
- python-picard

0 commit comments

Comments
 (0)