WIP, MAINT: Simpler VTK 9 on PyPI (mne-tools#7801)

* MAINT: Simpler VTK 9 on PyPi [circle front] * FIX: Try again [circle front] * FIX: Update * FIX: Try again
stlukyanenko · May 20, 2020 · 7726509 · 7726509
1 parent 9455fa8
commit 7726509
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -189,7 +189,7 @@ jobs:
       python -m pip install --upgrade pip setuptools
       python -m pip install --upgrade --pre --only-binary ":all:" -i "https://pypi.anaconda.org/scipy-wheels-nightly/simple" numpy
       python -m pip install --upgrade --pre --only-binary ":all:" -f "https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" scipy pandas scikit-learn matplotlib h5py Pillow
-      python -m pip install --only-binary ":all:" -f "https://vtk.org/download" "vtk>=9"
+      python -m pip install --upgrade --only-binary vtk vtk;
       python -m pip install https://github.com/enthought/mayavi/zipball/master
       python -m pip install -r requirements.txt
       python -m pip install codecov

diff --git a/environment.yml b/environment.yml
@@ -29,14 +29,16 @@ dependencies:
 - traits>=4.6.0
 - pyface>=6
 - traitsui>=6
-- vtk
 - imageio>=2.6.1
 - pip:
+  - -i "https://pypi.org/simple/"
+  - -f "https://vtk.org/download"
   - mne
   - https://github.com/numpy/numpydoc/archive/master.zip
   - imageio-ffmpeg>=0.4.1
+  - vtk
   - pyvista>=0.24
-  - mayavi
+  - https://github.com/enthought/mayavi/archive/master.zip
   - PySurfer[save_movie]
   - dipy --only-binary dipy
   - nibabel

diff --git a/requirements.txt b/requirements.txt
@@ -21,8 +21,9 @@ pytest-xdist
 joblib
 psutil
 dipy
+vtk -f "https://vtk.org/download"
 https://github.com/numpy/numpydoc/archive/master.zip
-mayavi
+https://github.com/enthought/mayavi/archive/master.zip
 PySurfer[save_movie]
 nilearn
 neo