From b79787c230b7923aab92f0dbaed27c6ae522012c Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 15 Jan 2023 13:17:47 +0100 Subject: [PATCH 1/2] Bump NumPy to 1.21 --- doc/api/next_api_changes/development/24919-KS.rst | 2 ++ doc/devel/dependencies.rst | 4 ++-- doc/devel/min_dep_policy.rst | 2 ++ environment.yml | 2 +- lib/matplotlib/__init__.py | 2 +- requirements/testing/minver.txt | 2 +- setup.py | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/api/next_api_changes/development/24919-KS.rst b/doc/api/next_api_changes/development/24919-KS.rst index 29cf1db12955..bd02c9955516 100644 --- a/doc/api/next_api_changes/development/24919-KS.rst +++ b/doc/api/next_api_changes/development/24919-KS.rst @@ -11,6 +11,8 @@ being bumped: +------------+-----------------+---------------+ | kiwisolver | 1.0.1 | 1.3.1 | +------------+-----------------+---------------+ +| numpy | 1.20.0 | 1.21.0 | ++------------+-----------------+---------------+ | Pillow | 6.2.1 | 8.0 | +------------+-----------------+---------------+ diff --git a/doc/devel/dependencies.rst b/doc/devel/dependencies.rst index 0f2eeb5cf86f..b3dc4c9dff29 100644 --- a/doc/devel/dependencies.rst +++ b/doc/devel/dependencies.rst @@ -21,7 +21,7 @@ reference. * `dateutil `_ (>= 2.7) * `fontTools `_ (>= 4.22.0) * `kiwisolver `_ (>= 1.3.1) -* `NumPy `_ (>= 1.20) +* `NumPy `_ (>= 1.21) * `packaging `_ (>= 20.0) * `Pillow `_ (>= 8.0) * `pyparsing `_ (>= 2.3.1) @@ -202,7 +202,7 @@ Setup dependencies - `setuptools_scm `_ (>= 7). Used to update the reported ``mpl.__version__`` based on the current git commit. Also a runtime dependency for editable installs. -- `NumPy `_ (>= 1.20). Also a runtime dependency. +- `NumPy `_ (>= 1.21). Also a runtime dependency. .. _compile-dependencies: diff --git a/doc/devel/min_dep_policy.rst b/doc/devel/min_dep_policy.rst index 0836315b8dd3..05efe541ef0f 100644 --- a/doc/devel/min_dep_policy.rst +++ b/doc/devel/min_dep_policy.rst @@ -87,6 +87,7 @@ specification of the dependencies. ========== ======== ====== Matplotlib Python NumPy ========== ======== ====== +`3.8`_ 3.9 1.21.0 `3.7`_ 3.8 1.20.0 `3.6`_ 3.8 1.19.0 `3.5`_ 3.7 1.17.0 @@ -106,6 +107,7 @@ Matplotlib Python NumPy 1.0 2.4 1.1 ========== ======== ====== +.. _`3.8`: https://matplotlib.org/3.8.0/devel/dependencies.html .. _`3.7`: https://matplotlib.org/3.7.0/devel/dependencies.html .. _`3.6`: https://matplotlib.org/3.6.0/devel/dependencies.html .. _`3.5`: https://matplotlib.org/3.5.0/devel/dependencies.html diff --git a/environment.yml b/environment.yml index 2de7fdd5def5..1c6502ecd96d 100644 --- a/environment.yml +++ b/environment.yml @@ -15,7 +15,7 @@ dependencies: - fonttools>=4.22.0 - importlib-resources>=3.2.0 - kiwisolver>=1.0.1 - - numpy>=1.20 + - numpy>=1.21 - pillow>=6.2 - pybind11>=2.6.0 - pygobject diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index b279c465163e..88aeb2552d6a 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -217,7 +217,7 @@ def _check_versions(): ("cycler", "0.10"), ("dateutil", "2.7"), ("kiwisolver", "1.0.1"), - ("numpy", "1.20"), + ("numpy", "1.21"), ("pyparsing", "2.3.1"), ]: module = importlib.import_module(modname) diff --git a/requirements/testing/minver.txt b/requirements/testing/minver.txt index bcc19d8bc07f..b3900e5992ef 100644 --- a/requirements/testing/minver.txt +++ b/requirements/testing/minver.txt @@ -4,7 +4,7 @@ contourpy==1.0.1 cycler==0.10 kiwisolver==1.3.1 importlib-resources==3.2.0 -numpy==1.20.0 +numpy==1.21.0 packaging==20.0 pillow==8.0.0 pyparsing==2.3.1 diff --git a/setup.py b/setup.py index afef9262c808..bbaa56f3d619 100644 --- a/setup.py +++ b/setup.py @@ -321,7 +321,7 @@ def make_release_tree(self, base_dir, files): "cycler>=0.10", "fonttools>=4.22.0", "kiwisolver>=1.0.1", - "numpy>=1.20", + "numpy>=1.21", "packaging>=20.0", "pillow>=6.2.0", "pyparsing>=2.3.1", From 51d4d433cf4c085e36e506dd7d7f145e619eea66 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Thu, 19 Jan 2023 22:53:27 +0100 Subject: [PATCH 2/2] Update doc/api/next_api_changes/development/24919-KS.rst Co-authored-by: Elliott Sales de Andrade --- doc/api/next_api_changes/development/24919-KS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/next_api_changes/development/24919-KS.rst b/doc/api/next_api_changes/development/24919-KS.rst index bd02c9955516..fece0616ac71 100644 --- a/doc/api/next_api_changes/development/24919-KS.rst +++ b/doc/api/next_api_changes/development/24919-KS.rst @@ -11,7 +11,7 @@ being bumped: +------------+-----------------+---------------+ | kiwisolver | 1.0.1 | 1.3.1 | +------------+-----------------+---------------+ -| numpy | 1.20.0 | 1.21.0 | +| NumPy | 1.20.0 | 1.21.0 | +------------+-----------------+---------------+ | Pillow | 6.2.1 | 8.0 | +------------+-----------------+---------------+