From 87b2948c6f12f13c0d9fe090c35e8881c15b7934 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Mon, 16 May 2022 17:08:07 +0200 Subject: [PATCH 1/4] fix --- tools/github_actions_dependencies.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh index f832065833c..a670b0dc5f6 100755 --- a/tools/github_actions_dependencies.sh +++ b/tools/github_actions_dependencies.sh @@ -14,8 +14,9 @@ else echo "Date utils" # https://pip.pypa.io/en/latest/user_guide/#possible-ways-to-reduce-backtracking-occurring pip install $STD_ARGS --pre --only-binary ":all:" python-dateutil pytz joblib threadpoolctl six - echo "PyQt6" - pip install $STD_ARGS --pre --only-binary ":all:" --no-deps --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6 PyQt6-sip PyQt6-Qt6 + # XXX: the wheels for PyQt6-sip 13.4 are not available yet from https://www.riverbankcomputing.com/pypi/simple + # echo "PyQt6" + # pip install $STD_ARGS --pre --only-binary ":all:" --no-deps --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6 PyQt6-sip PyQt6-Qt6 echo "NumPy/SciPy/pandas etc." pip install $STD_ARGS --pre --only-binary ":all:" --no-deps --default-timeout=60 -i "https://pypi.anaconda.org/scipy-wheels-nightly/simple" numpy scipy pandas scikit-learn statsmodels dipy echo "H5py, pillow, matplotlib" From c7ee1c3dbfa6d92d67c229116151f8837c8f383f Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Mon, 16 May 2022 17:18:14 +0200 Subject: [PATCH 2/4] fix --- tools/github_actions_dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh index a670b0dc5f6..8a24059c900 100755 --- a/tools/github_actions_dependencies.sh +++ b/tools/github_actions_dependencies.sh @@ -17,6 +17,7 @@ else # XXX: the wheels for PyQt6-sip 13.4 are not available yet from https://www.riverbankcomputing.com/pypi/simple # echo "PyQt6" # pip install $STD_ARGS --pre --only-binary ":all:" --no-deps --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6 PyQt6-sip PyQt6-Qt6 + pip install $STD_ARGS --only-binary ":all:" PyQt6 PyQt6-sip PyQt6-Qt6 echo "NumPy/SciPy/pandas etc." pip install $STD_ARGS --pre --only-binary ":all:" --no-deps --default-timeout=60 -i "https://pypi.anaconda.org/scipy-wheels-nightly/simple" numpy scipy pandas scikit-learn statsmodels dipy echo "H5py, pillow, matplotlib" From a344d52f7315eee94f0d4cbd13d91da9ca834e7e Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Mon, 16 May 2022 17:21:06 +0200 Subject: [PATCH 3/4] update --- tools/github_actions_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh index 8a24059c900..836dbe83c03 100755 --- a/tools/github_actions_dependencies.sh +++ b/tools/github_actions_dependencies.sh @@ -14,8 +14,8 @@ else echo "Date utils" # https://pip.pypa.io/en/latest/user_guide/#possible-ways-to-reduce-backtracking-occurring pip install $STD_ARGS --pre --only-binary ":all:" python-dateutil pytz joblib threadpoolctl six + echo "PyQt6" # XXX: the wheels for PyQt6-sip 13.4 are not available yet from https://www.riverbankcomputing.com/pypi/simple - # echo "PyQt6" # pip install $STD_ARGS --pre --only-binary ":all:" --no-deps --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6 PyQt6-sip PyQt6-Qt6 pip install $STD_ARGS --only-binary ":all:" PyQt6 PyQt6-sip PyQt6-Qt6 echo "NumPy/SciPy/pandas etc." From 90500890b226a63ffe0a98cbde2d0c2f89112738 Mon Sep 17 00:00:00 2001 From: Guillaume Favelier Date: Mon, 16 May 2022 17:36:46 +0200 Subject: [PATCH 4/4] azure too --- tools/azure_dependencies.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/azure_dependencies.sh b/tools/azure_dependencies.sh index e98a9c12da6..a7211f0195b 100755 --- a/tools/azure_dependencies.sh +++ b/tools/azure_dependencies.sh @@ -10,7 +10,9 @@ if [ "${TEST_MODE}" == "pip" ]; then 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 - python -m pip install --progress-bar off --upgrade --pre --only-binary ":all:" --no-deps --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6 PyQt6-sip PyQt6-Qt6 + # XXX: the wheels for PyQt6-sip 13.4 are not available yet from https://www.riverbankcomputing.com/pypi/simple + # python -m pip install --progress-bar off --upgrade --pre --only-binary ":all:" --no-deps --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6 PyQt6-sip PyQt6-Qt6 + python -m pip install --progress-bar off --upgrade --only-binary ":all:" PyQt6 PyQt6-sip PyQt6-Qt6 # SciPy Windows build is missing from conda nightly builds python -m pip install --progress-bar off --upgrade --pre --only-binary ":all:" --no-deps -i "https://pypi.anaconda.org/scipy-wheels-nightly/simple" numpy python -m pip install --progress-bar off --upgrade --pre --only-binary ":all:" --no-deps scipy