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

Skip to content

Commit 3696e06

Browse files
authored
Merge pull request #24992 from oscargus/numpy122
Bump NumPy to 1.21
2 parents 3309b15 + 51d4d43 commit 3696e06

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

doc/api/next_api_changes/development/24919-KS.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ being bumped:
1111
+------------+-----------------+---------------+
1212
| kiwisolver | 1.0.1 | 1.3.1 |
1313
+------------+-----------------+---------------+
14+
| NumPy | 1.20.0 | 1.21.0 |
15+
+------------+-----------------+---------------+
1416
| Pillow | 6.2.1 | 8.0 |
1517
+------------+-----------------+---------------+
1618

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.20)
24+
* `NumPy <https://numpy.org>`_ (>= 1.21)
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)
@@ -202,7 +202,7 @@ Setup dependencies
202202
- `setuptools_scm <https://pypi.org/project/setuptools-scm/>`_ (>= 7). Used to
203203
update the reported ``mpl.__version__`` based on the current git commit.
204204
Also a runtime dependency for editable installs.
205-
- `NumPy <https://numpy.org>`_ (>= 1.20). Also a runtime dependency.
205+
- `NumPy <https://numpy.org>`_ (>= 1.21). Also a runtime dependency.
206206

207207

208208
.. _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.8`_ 3.9 1.21.0
9091
`3.7`_ 3.8 1.20.0
9192
`3.6`_ 3.8 1.19.0
9293
`3.5`_ 3.7 1.17.0
@@ -106,6 +107,7 @@ Matplotlib Python NumPy
106107
1.0 2.4 1.1
107108
========== ======== ======
108109

110+
.. _`3.8`: https://matplotlib.org/3.8.0/devel/dependencies.html
109111
.. _`3.7`: https://matplotlib.org/3.7.0/devel/dependencies.html
110112
.. _`3.6`: https://matplotlib.org/3.6.0/devel/dependencies.html
111113
.. _`3.5`: https://matplotlib.org/3.5.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.20
18+
- numpy>=1.21
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
@@ -217,7 +217,7 @@ def _check_versions():
217217
("cycler", "0.10"),
218218
("dateutil", "2.7"),
219219
("kiwisolver", "1.0.1"),
220-
("numpy", "1.20"),
220+
("numpy", "1.21"),
221221
("pyparsing", "2.3.1"),
222222
]:
223223
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.20.0
7+
numpy==1.21.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
@@ -321,7 +321,7 @@ def make_release_tree(self, base_dir, files):
321321
"cycler>=0.10",
322322
"fonttools>=4.22.0",
323323
"kiwisolver>=1.0.1",
324-
"numpy>=1.20",
324+
"numpy>=1.21",
325325
"packaging>=20.0",
326326
"pillow>=6.2.0",
327327
"pyparsing>=2.3.1",

0 commit comments

Comments
 (0)