Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5366eab

Browse files
committed
Bump minimum NumPy version to 1.22
1 parent 9b16729 commit 5366eab

File tree

8 files changed

+23
-7
lines changed

8 files changed

+23
-7
lines changed

.github/workflows/cygwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
shell: bash.exe -eo pipefail -o igncr "{0}"
176176
run: |
177177
python -m pip install --upgrade pip 'setuptools<60' wheel
178-
python -m pip install kiwisolver 'numpy!=1.21.*' pillow importlib_resources
178+
python -m pip install kiwisolver 'numpy>=1.22,<1.26' pillow importlib_resources
179179
grep -v -F -e psutil requirements/testing/all.txt >requirements_test.txt
180180
python -m pip install meson-python pybind11
181181
export PATH="/usr/local/bin:$PATH"
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Increase to minimum supported versions of dependencies
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
For Matplotlib 3.9, the :ref:`minimum supported versions <dependencies>` are
5+
being bumped:
6+
7+
+------------+-----------------+---------------+
8+
| Dependency | min in mpl3.8 | min in mpl3.9 |
9+
+============+=================+===============+
10+
| NumPy | 1.21.0 | 1.22.0 |
11+
+------------+-----------------+---------------+
12+
13+
This is consistent with our :ref:`min_deps_policy` and `NEP29
14+
<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__

doc/devel/dependencies.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ reference.
2121
* `dateutil <https://pypi.org/project/python-dateutil/>`_ (>= 2.7)
2222
* `fontTools <https://fonttools.readthedocs.io/en/latest/>`_ (>= 4.22.0)
2323
* `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.3.1)
24-
* `NumPy <https://numpy.org>`_ (>= 1.21)
24+
* `NumPy <https://numpy.org>`_ (>= 1.22)
2525
* `packaging <https://pypi.org/project/packaging/>`_ (>= 20.0)
2626
* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 8.0)
2727
* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>= 2.3.1)
@@ -232,7 +232,7 @@ Setup dependencies
232232
- `setuptools_scm <https://pypi.org/project/setuptools-scm/>`_ (>= 7). Used to
233233
update the reported ``mpl.__version__`` based on the current git commit.
234234
Also a runtime dependency for editable installs.
235-
- `NumPy <https://numpy.org>`_ (>= 1.21). Also a runtime dependency.
235+
- `NumPy <https://numpy.org>`_ (>= 1.22). Also a runtime dependency.
236236

237237

238238
.. _compile-dependencies:

doc/devel/min_dep_policy.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ specification of the dependencies.
8787
========== ======== ======
8888
Matplotlib Python NumPy
8989
========== ======== ======
90+
`3.9`_ 3.9 1.22.0
9091
`3.8`_ 3.9 1.21.0
9192
`3.7`_ 3.8 1.20.0
9293
`3.6`_ 3.8 1.19.0
@@ -107,6 +108,7 @@ Matplotlib Python NumPy
107108
1.0 2.4 1.1
108109
========== ======== ======
109110

111+
.. _`3.9`: https://matplotlib.org/3.9.0/devel/dependencies.html
110112
.. _`3.8`: https://matplotlib.org/3.8.0/devel/dependencies.html
111113
.. _`3.7`: https://matplotlib.org/3.7.0/devel/dependencies.html
112114
.. _`3.6`: https://matplotlib.org/3.6.0/devel/dependencies.html

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- fonttools>=4.22.0
1616
- importlib-resources>=3.2.0
1717
- kiwisolver>=1.0.1
18-
- numpy>=1.21
18+
- numpy>=1.22
1919
- pillow>=6.2
2020
- pybind11>=2.6.0
2121
- pygobject

lib/matplotlib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def _check_versions():
247247
("cycler", "0.10"),
248248
("dateutil", "2.7"),
249249
("kiwisolver", "1.0.1"),
250-
("numpy", "1.21"),
250+
("numpy", "1.22"),
251251
("pyparsing", "2.3.1"),
252252
]:
253253
module = importlib.import_module(modname)

requirements/testing/minver.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ contourpy==1.0.1
44
cycler==0.10
55
kiwisolver==1.3.1
66
importlib-resources==3.2.0
7-
numpy==1.21.0
7+
numpy==1.22.0
88
packaging==20.0
99
pillow==8.0.0
1010
pyparsing==2.3.1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def make_release_tree(self, base_dir, files):
333333
"cycler>=0.10",
334334
"fonttools>=4.22.0",
335335
"kiwisolver>=1.0.1",
336-
"numpy>=1.21",
336+
"numpy>=1.22",
337337
"packaging>=20.0",
338338
"pillow>=6.2.0",
339339
"pyparsing>=2.3.1",

0 commit comments

Comments
 (0)