Skip to content

Commit

Permalink
FIX: NumPy 2.0 breaks everything
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner committed Nov 20, 2023
1 parent c65c9c4 commit e483889
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ test_extra = [
doc = [
"sphinx>=6",
"numpydoc",
"pydata_sphinx_theme==0.14.3",
"pydata_sphinx_theme==0.13.3",
"sphinx-gallery",
"sphinxcontrib-bibtex>=2.5",
"memory_profiler",
Expand Down
8 changes: 5 additions & 3 deletions tools/azure_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ elif [ "${TEST_MODE}" == "pip-pre" ]; then
STD_ARGS="$STD_ARGS --pre"
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://www.riverbankcomputing.com/pypi/simple" PyQt6 PyQt6-sip PyQt6-Qt6
echo "Numpy etc."
# As of 2023/10/25 no pandas (or statsmodels) because they pin to NumPy < 2
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0.dev0" "scipy>=1.12.0.dev0" scikit-learn matplotlib
# See github_actions_dependencies.sh for comments
python -m pip install $STD_ARGS --only-binary "numpy" numpy
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "scipy>=1.12.0.dev0" scikit-learn matplotlib pandas statsmodels
echo "dipy"
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://pypi.anaconda.org/scipy-wheels-nightly/simple" dipy
echo "h5py"
python -m pip install $STD_ARGS --only-binary ":all:" -f "https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" h5py
echo "vtk"
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
echo "openmeeg"
echo "nilearn and openmeeg"
python -m pip install $STD_ARGS git+https://github.com/nilearn/nilearn
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
echo "pyvista/pyvistaqt"
python -m pip install --progress-bar off git+https://github.com/pyvista/pyvista
Expand Down
8 changes: 5 additions & 3 deletions tools/github_actions_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ else
echo "PyQt6"
pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6
echo "NumPy/SciPy/pandas etc."
# As of 2023/10/25 no pandas (or statsmodels, nilearn) because they pin to NumPy < 2
pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy>=2.0.0.dev0" scipy scikit-learn matplotlib pillow
# As of 2023/11/20 no NumPy 2.0 because it requires everything using its ABI to
# compile against 2.0, and h5py isn't (and probably not VTK either)
pip install $STD_ARGS --only-binary "numpy" --default-timeout=60 numpy
pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" scipy scikit-learn matplotlib pillow pandas statsmodels
echo "dipy"
pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url "https://pypi.anaconda.org/scipy-wheels-nightly/simple" dipy
echo "H5py"
Expand All @@ -34,7 +36,7 @@ else
pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
# No Numba because it forces an old NumPy version
echo "nilearn and openmeeg"
# pip install $STD_ARGS git+https://github.com/nilearn/nilearn
pip install $STD_ARGS git+https://github.com/nilearn/nilearn
pip install $STD_ARGS openmeeg
echo "VTK"
pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
Expand Down

0 comments on commit e483889

Please sign in to comment.