Skip to content

Commit e483889

Browse files
committed
FIX: NumPy 2.0 breaks everything
1 parent c65c9c4 commit e483889

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ test_extra = [
133133
doc = [
134134
"sphinx>=6",
135135
"numpydoc",
136-
"pydata_sphinx_theme==0.14.3",
136+
"pydata_sphinx_theme==0.13.3",
137137
"sphinx-gallery",
138138
"sphinxcontrib-bibtex>=2.5",
139139
"memory_profiler",

tools/azure_dependencies.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ elif [ "${TEST_MODE}" == "pip-pre" ]; then
88
STD_ARGS="$STD_ARGS --pre"
99
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://www.riverbankcomputing.com/pypi/simple" PyQt6 PyQt6-sip PyQt6-Qt6
1010
echo "Numpy etc."
11-
# As of 2023/10/25 no pandas (or statsmodels) because they pin to NumPy < 2
12-
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
11+
# See github_actions_dependencies.sh for comments
12+
python -m pip install $STD_ARGS --only-binary "numpy" numpy
13+
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
1314
echo "dipy"
1415
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://pypi.anaconda.org/scipy-wheels-nightly/simple" dipy
1516
echo "h5py"
1617
python -m pip install $STD_ARGS --only-binary ":all:" -f "https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" h5py
1718
echo "vtk"
1819
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
19-
echo "openmeeg"
20+
echo "nilearn and openmeeg"
21+
python -m pip install $STD_ARGS git+https://github.com/nilearn/nilearn
2022
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
2123
echo "pyvista/pyvistaqt"
2224
python -m pip install --progress-bar off git+https://github.com/pyvista/pyvista

tools/github_actions_dependencies.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ else
2424
echo "PyQt6"
2525
pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url https://www.riverbankcomputing.com/pypi/simple PyQt6
2626
echo "NumPy/SciPy/pandas etc."
27-
# As of 2023/10/25 no pandas (or statsmodels, nilearn) because they pin to NumPy < 2
28-
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
27+
# As of 2023/11/20 no NumPy 2.0 because it requires everything using its ABI to
28+
# compile against 2.0, and h5py isn't (and probably not VTK either)
29+
pip install $STD_ARGS --only-binary "numpy" --default-timeout=60 numpy
30+
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
2931
echo "dipy"
3032
pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url "https://pypi.anaconda.org/scipy-wheels-nightly/simple" dipy
3133
echo "H5py"
@@ -34,7 +36,7 @@ else
3436
pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
3537
# No Numba because it forces an old NumPy version
3638
echo "nilearn and openmeeg"
37-
# pip install $STD_ARGS git+https://github.com/nilearn/nilearn
39+
pip install $STD_ARGS git+https://github.com/nilearn/nilearn
3840
pip install $STD_ARGS openmeeg
3941
echo "VTK"
4042
pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk

0 commit comments

Comments
 (0)