Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Dependencies
Matplotlib requires the following dependencies:

* `Python <https://www.python.org/downloads/>`_ (>= 3.6)
* `NumPy <http://www.numpy.org>`_ (>= 1.11)
* `NumPy <http://www.numpy.org>`_ (>= 1.12)
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
* `cycler <http://matplotlib.org/cycler/>`_ (>= 0.10.0)
* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.1)
Expand Down
3 changes: 3 additions & 0 deletions doc/api/next_api_changes/development.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Development changes
-------------------

Matplotlib now requires numpy>=1.12
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Matplotlib now uses Pillow to save and read pngs
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion doc/devel/min_dep_policy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion requirements/testing/travis36minver.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

cycler==0.10
python-dateutil==2.1
numpy==1.11.0
numpy==1.12.0
pyparsing==2.0.1
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down