From fe59d81295afb92ddced87da4179df0b746b90b4 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sat, 9 Nov 2019 18:42:01 +0100 Subject: [PATCH] Bump minimal numpy version to 1.12. Numpy 1.12 was released in January 2017 (https://github.com/numpy/numpy/tags?after=v1.12.1), which will be more than 3y ago when mpl3.3 will be released, so it's fine to depend on it per the dependency policy. Numpy 1.12 added pathlib support for numpy.load, a minor convenience for improving cbook.get_sample_data. --- INSTALL.rst | 2 +- doc/api/next_api_changes/development.rst | 3 +++ doc/devel/min_dep_policy.rst | 2 +- lib/matplotlib/__init__.py | 2 +- requirements/testing/travis36minver.txt | 2 +- setup.py | 4 ++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/INSTALL.rst b/INSTALL.rst index 474de6511585..0226a86d6f99 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -109,7 +109,7 @@ Dependencies Matplotlib requires the following dependencies: * `Python `_ (>= 3.6) -* `NumPy `_ (>= 1.11) +* `NumPy `_ (>= 1.12) * `setuptools `_ * `cycler `_ (>= 0.10.0) * `dateutil `_ (>= 2.1) diff --git a/doc/api/next_api_changes/development.rst b/doc/api/next_api_changes/development.rst index 389cff4f1067..25b063d98965 100644 --- a/doc/api/next_api_changes/development.rst +++ b/doc/api/next_api_changes/development.rst @@ -1,6 +1,9 @@ Development changes ------------------- +Matplotlib now requires numpy>=1.12 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Matplotlib now uses Pillow to save and read pngs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/devel/min_dep_policy.rst b/doc/devel/min_dep_policy.rst index 3e02d95eaf1e..d9233d5c527e 100644 --- a/doc/devel/min_dep_policy.rst +++ b/doc/devel/min_dep_policy.rst @@ -77,7 +77,7 @@ specification of the dependencies. ========== ======== ====== Matplotlib Python NumPy ========== ======== ====== -3.3 3.6 1.11.0 +3.3 3.6 1.12.0 3.2 3.6 1.11.0 `3.1`_ 3.6 1.11.0 `3.0`_ 3.5 1.10.0 diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index f70929e47990..f3a9bc6d8c6e 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -194,7 +194,7 @@ def _check_versions(): ("cycler", "0.10"), ("dateutil", "2.1"), ("kiwisolver", "1.0.1"), - ("numpy", "1.11"), + ("numpy", "1.12"), ("pyparsing", "2.0.1"), ]: module = importlib.import_module(modname) diff --git a/requirements/testing/travis36minver.txt b/requirements/testing/travis36minver.txt index 7e2f6208e9d3..7d35b618b784 100644 --- a/requirements/testing/travis36minver.txt +++ b/requirements/testing/travis36minver.txt @@ -2,5 +2,5 @@ cycler==0.10 python-dateutil==2.1 -numpy==1.11.0 +numpy==1.12.0 pyparsing==2.0.1 diff --git a/setup.py b/setup.py index 06cc5fc22fad..86795370dddd 100644 --- a/setup.py +++ b/setup.py @@ -255,12 +255,12 @@ def run(self): python_requires='>={}'.format('.'.join(str(n) for n in min_version)), setup_requires=[ - "numpy>=1.11", + "numpy>=1.12", ], install_requires=[ "cycler>=0.10", "kiwisolver>=1.0.1", - "numpy>=1.11", + "numpy>=1.12", "pillow>=6.2.0", "pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6", "python-dateutil>=2.1",