rollback in CIs

mne-tools · Jul 22, 2022 · 815f18b · 815f18b
1 parent 0c22c4d
commit 815f18b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -116,7 +116,7 @@ stages:
     - bash: |
         set -e
         python -m pip install --progress-bar off --upgrade pip setuptools wheel codecov
-        python -m pip install --progress-bar off mne-qt-browser[opengl] https://github.com/pyvista/pyvista/zipball/main scikit-learn pytest-error-for-skips python-picard "PySide6!=6.3.0" qtpy
+        python -m pip install --progress-bar off mne-qt-browser[opengl] pyvista scikit-learn pytest-error-for-skips python-picard "PySide6!=6.3.0" qtpy
         python -m pip uninstall -yq mne
         python -m pip install --progress-bar off --upgrade -e .[test]
       displayName: 'Install dependencies with pip'
@@ -179,7 +179,7 @@ stages:
         wget -q https://osf.io/ajder/download -O vtk-9.1.20220406.dev0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
         python -m pip install --pre --only-binary ":all:" vtk-9.1.20220406.dev0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
         python -c "import vtk"
-        python -m pip install --progress-bar off --upgrade -r requirements.txt -r requirements_testing.txt -r requirements_testing_extra.txt codecov https://github.com/pyvista/pyvista/zipball/main
+        python -m pip install --progress-bar off --upgrade -r requirements.txt -r requirements_testing.txt -r requirements_testing_extra.txt codecov
         python -m pip install -e .
       displayName: 'Install dependencies with pip'
     - bash: |
@@ -309,7 +309,7 @@ stages:
       displayName: Remove old MNE
     - script: pip install -e .
       displayName: 'Install MNE-Python dev'
-    - script: pip install --progress-bar off -e .[test] codecov https://github.com/pyvista/pyvista/zipball/main
+    - script: pip install --progress-bar off -e .[test] codecov
       condition: eq(variables['TEST_MODE'], 'conda')
       displayName: Install testing requirements
     - script: mne sys_info -pd

diff --git a/tools/azure_dependencies.sh b/tools/azure_dependencies.sh
@@ -7,8 +7,6 @@ if [ "${TEST_MODE}" == "pip" ]; then
 	python -m pip install --upgrade --only-binary="numba,llvmlite" -r requirements.txt
 	# This can be removed once PyVistaQt 0.6 is out (including https://github.com/pyvista/pyvistaqt/pull/127)
 	python -m pip install --upgrade https://github.com/pyvista/pyvistaqt/zipball/main
-	# Temporary workaround until the fix is released
-	python -m pip install --progress-bar off https://github.com/pyvista/pyvista/zipball/main
 elif [ "${TEST_MODE}" == "pip-pre" ]; then
 	python -m pip install --progress-bar off --upgrade pip setuptools wheel
 	python -m pip install --progress-bar off --upgrade --pre --only-binary ":all:" python-dateutil pytz joblib threadpoolctl six cycler kiwisolver pyparsing patsy

diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh
@@ -52,10 +52,3 @@ fi
 if [ "${DEPS}" != "minimal" ]; then
 	pip install $STD_ARGS $EXTRA_ARGS -r requirements_testing_extra.txt
 fi
-
-# Temporary workaround until the fix is released
-
-# Hopefully temporary workaround until it's merged and released
-if [[ "$(pip list)" == *'pyvista '* ]]; then
-	python -m pip install --progress-bar off https://github.com/pyvista/pyvista/zipball/main
-fi