8000 Merge pull request #24887 from oscargus/numpy120 · matplotlib/matplotlib@5793ebb · GitHub
[go: up one dir, main page]
Skip to content

Commit 5793ebb

Browse files
ksundenksunden
authored
Merge pull request #24887 from oscargus/numpy120
[MNT] Bump NumPy to 1.20
2 parents bf48846 + fbaefe8 commit 5793ebb

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

‎doc/api/next_api_changes/development/24887-OG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
numpy>=1.20 is now required
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎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.0.1)
24-
* `NumPy <https://numpy.org>`_ (>= 1.19)
24+
* `NumPy <https://numpy.org>`_ (>= 1.20)
2525
* `packaging <https://pypi.org/project/packaging/>`_ (>= 20.0)
2626
* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 6.2)
2727
* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>= 2.3.1)
@@ -203,7 +203,7 @@ Setup dependencies
203203
- `setuptools_scm <https://pypi.org/project/setuptools-scm/>`_ (>= 7). Used to
204204
update the reported ``mpl.__version__`` based on the current git commit.
205205
Also a runtime dependency for editable installs.
206-
- `NumPy <https://numpy.org>`_ (>= 1.19). Also a runtime dependency.
206+
- `NumPy <https://numpy.org>`_ (>= 1.20). Also a runtime dependency.
207207

208208

209209
.. _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.7`_ 3.8 1.20.0
9091
`3.6`_ 3.8 1.19.0
9192
`3.5`_ 3.7 1.17.0
9293
`3.4`_ 3.7 1.16.0
@@ -105,6 +106,7 @@ Matplotlib Python NumPy
105106
1.0 2.4 1.1
106107
========== ======== ======
107108

109+
.. _`3.7`: https://matplotlib.org/3.7.0/devel/dependencies.html
108110
.. _`3.6`: https://matplotlib.org/3.6.0/devel/dependencies.html
109111
.. _`3.5`: https://matplotlib.org/3.5.0/devel/dependencies.html
110112
.. _`3.4`: https://matplotlib.org/3.4.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.19
18+
- numpy>=1.20
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.19"),
220+
("numpy", "1.20"),
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.0.1
66
importlib-resources==3.2.0
7-
numpy==1.19.0
7+
numpy==1.20.0
88
packaging==20.0
99
pillow==6.2.1
1010
pyparsing==2.3.1

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ def make_release_tree(self, base_dir, files):
322322
"cycler>=0.10",
323323
"fonttools>=4.22.0",
324324
"kiwisolver>=1.0.1",
325-
"numpy>=1.19",
325+
"numpy>=1.20",
326326
"packaging>=20.0",
327327
"pillow>=6.2.0",
328328
"pyparsing>=2.3.1",

0 commit comments

Comments
 (0)
0