From ae545375bd89116045b2dc56aceaf5276ba00ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20H=C3=B6chenberger?= Date: Mon, 6 Nov 2023 21:26:23 +0100 Subject: [PATCH] Don't install build dependencies that should be automatically installed thanks [build-system] in pyproject.toml --- .circleci/config.yml | 2 +- azure-pipelines.yml | 6 +++--- tools/azure_dependencies.sh | 2 +- tools/circleci_dependencies.sh | 2 +- tools/github_actions_dependencies.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ae98253d3d..ca318590053 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: brew install python@3.11 which python which pip - pip install --upgrade pip setuptools wheel + pip install --upgrade pip pip install --upgrade --only-binary "numpy,scipy,dipy,statsmodels" -ve .[test] PyQt6 # 3D too slow on Apple's software renderer, and numba causes us problems pip uninstall -y vtk pyvista pyvistaqt numba diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3983d53823..c4f5f7bf96e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,7 +51,7 @@ stages: displayName: 'Get Python' - bash: | set -eo pipefail - python -m pip install --progress-bar off --upgrade pip setuptools wheel + python -m pip install --progress-bar off --upgrade pip build python -m pip install --progress-bar off -ve .[hdf5,test_base] python -m pip uninstall -yq pytest-qt # don't want to set up display, etc. for this pre-commit install --install-hooks @@ -107,7 +107,7 @@ stages: displayName: 'Get Python' - bash: | set -e - python -m pip install --progress-bar off --upgrade pip setuptools wheel + python -m pip install --progress-bar off --upgrade pip python -m pip install --progress-bar off "mne-qt-browser[opengl] @ git+https://github.com/mne-tools/mne-qt-browser.git@main" pyvista scikit-learn pytest-error-for-skips python-picard "PyQt6!=6.5.1" qtpy nibabel python -m pip uninstall -yq mne python -m pip install --progress-bar off --upgrade -e .[test] @@ -166,7 +166,7 @@ stages: displayName: 'Get Python' - bash: | set -e - python -m pip install --progress-bar off --upgrade pip setuptools wheel + python -m pip install --progress-bar off --upgrade pip python -m pip install --progress-bar off --upgrade --pre --only-binary=\"numpy,scipy,matplotlib,vtk\" numpy scipy matplotlib vtk python -c "import vtk" python -m pip install --progress-bar off --upgrade -ve .[test] diff --git a/tools/azure_dependencies.sh b/tools/azure_dependencies.sh index f9af160a406..23337084597 100755 --- a/tools/azure_dependencies.sh +++ b/tools/azure_dependencies.sh @@ -2,7 +2,7 @@ STD_ARGS="--progress-bar off --upgrade" if [ "${TEST_MODE}" == "pip" ]; then - python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade pip python -m pip install --upgrade --only-binary="numba,llvmlite,numpy,scipy,vtk" -ve .[full] elif [ "${TEST_MODE}" == "pip-pre" ]; then STD_ARGS="$STD_ARGS --pre" diff --git a/tools/circleci_dependencies.sh b/tools/circleci_dependencies.sh index 36bae8d0bc1..2413f385f77 100755 --- a/tools/circleci_dependencies.sh +++ b/tools/circleci_dependencies.sh @@ -1,4 +1,4 @@ #!/bin/bash -ef -python -m pip install --upgrade "pip!=20.3.0" setuptools wheel +python -m pip install --upgrade "pip!=20.3.0" python -m pip install --upgrade --progress-bar off --only-binary "numpy,scipy,matplotlib,pandas,statsmodels" PyQt6 git+https://github.com/mne-tools/mne-qt-browser -ve .[full,test_base,doc] diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh index 6cc96ac6af3..bc8d7ef1af2 100755 --- a/tools/github_actions_dependencies.sh +++ b/tools/github_actions_dependencies.sh @@ -14,7 +14,7 @@ else echo "Install pip-pre dependencies" test "${MNE_CI_KIND}" == "pip-pre" STD_ARGS="$STD_ARGS --pre" - python -m pip install $STD_ARGS pip setuptools wheel packaging + python -m pip install $STD_ARGS pip echo "Numpy" pip uninstall -yq numpy echo "PyQt6"