8000 Merge pull request #20003 from QuLogic/np117 · matplotlib/matplotlib@d7c70bb · GitHub
[go: up one dir, main page]
Skip to content

Commit d7c70bb

Browse files
jkseppanjkseppan
authored
Merge pull request #20003 from QuLogic/np117
Bump minimum NumPy to 1.17
2 parents 319f24f + aa500f5 commit d7c70bb

File tree

9 files changed

+27
-10
lines changed

9 files changed

+27
-10
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
- pip-install
151151

152152
- deps-install:
153-
numpy_version: "==1.16.0"
153+
numpy_version: "==1.17.3"
154154
- mpl-install
155155

156156
- doc-build

‎.github/workflows/cibuildwheel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Build wheels on ${{ matrix.os }}
1414
runs-on: ${{ matrix.os }}
1515
env:
16-
min-numpy-version: "1.16.0"
17-
min-numpy-hash: "04/b6/d7faa70a3e3eac39f943cc6a6a64ce378259677de516bd899dd9eb8f9b32"
16+
min-numpy-version: "1.17.0"
17+
min-numpy-hash: "da/32/1b8f2bb5fb50e4db68543eb85ce37b9fa6660cd05b58bddfafafa7ed62da"
1818
strategy:
1919
matrix:
2020
os: [ubuntu-18.04, windows-latest, macos-latest]

‎doc/api/next_api_changes/development/20003-ES.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Increase to minimum supported versions of dependencies
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
For Maptlotlib 3.5, the :ref:`minimum supported versions <dependencies>` are
5+
being bumped:
6+
7+
+------------+-----------------+---------------+
8+
| Dependency | min in mpl3.4 | min in mpl3.5 |
9+
+============+=================+===============+
10+
| NumPy | 1.16 | 1.17 |
11+
+------------+-----------------+---------------+
12+
13+
This is consistent with our :ref:`min_deps_policy` and `NEP29
14+
<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__
15+

‎doc/devel/dependencies.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mandatory dependencies are automatically installed. This list is mainly for
1515
reference.
1616

1717
* `Python <https://www.python.org/downloads/>`_ (>= 3.7)
18-
* `NumPy <https://numpy.org>`_ (>= 1.16)
18+
* `NumPy <https://numpy.org>`_ (>= 1.17)
1919
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
2020
* `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)
2121
* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.7)

‎doc/devel/min_dep_policy.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ specification of the dependencies.
8383
========== ======== ======
8484
Matplotlib Python NumPy
8585
========== ======== ======
86-
3.4 3.7 1.16.0
86+
3.5 3.7 1.17.0
87+
`3.4`_ 3.7 1.16.0
8788
`3.3`_ 3.6 1.15.0
8889
`3.2`_ 3.6 1.11.0
8990
`3.1`_ 3.6 1.11.0
@@ -99,6 +100,7 @@ Matplotlib Python NumPy
99100
1.0 2.4 1.1
100101
========== ======== ======
101102

103+
.. _`3.4`: https://matplotlib.org/3.4.0/users/installing.html#dependencies
102104
.. _`3.3`: https://matplotlib.org/3.3.0/users/installing.html#dependencies
103105
.. _`3.2`: https://matplotlib.org/3.2.0/users/installing.html#dependencies
104106
.. _`3.1`: https://matplotlib.org/3.1.0/users/installing.html#dependencies

‎lib/matplotlib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def _check_versions():
161161
("cycler", "0.10"),
162162
("dateutil", "2.7"),
163163
("kiwisolver", "1.0.1"),
164-
("numpy", "1.16"),
164+
("numpy", "1.17"),
165165
("pyparsing", "2.2.1"),
166166
]:
167167
module = importlib.import_module(modname)

‎lib/matplotlib/tests/test_axes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ def test_fill_between_interpolate_nan():
10061006
y1 = np.asarray([8, 18, np.nan, 18, 8, 18, 24, 18, 8, 18])
10071007
y2 = np.asarray([18, 11, 8, 11, 18, 26, 32, 30, np.nan, np.nan])
10081008

1009-
# numpy 1.16 issues warning 'invalid value encountered in greater_equal'
1009+
# NumPy <1.19 issues warning 'invalid value encountered in greater_equal'
10101010
# for comparisons that include nan.
10111011
with np.errstate(invalid='ignore'):
10121012
greater2 = y2 >= y1

‎requirements/testing/minver.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
cycler==0.10
44
kiwisolver==1.0.1
5-
numpy==1.16.0
5+
numpy==1.17.0
66
pillow==6.2.0
77
pyparsing==2.2.1
88
python-dateutil==2.7

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,14 @@ def make_release_tree(self, base_dir, files):
305305
python_requires='>={}'.format('.'.join(str(n) for n in py_min_version)),
306306
setup_requires=[
307307
"certifi>=2020.06.20",
308-
"numpy>=1.16",
308+
"numpy>=1.17",
309309
"setuptools_scm>=4",
310310
"setuptools_scm_git_archive",
311311
],
312312
install_requires=[
313313
"cycler>=0.10",
314314
"kiwisolver>=1.0.1",
315-
"numpy>=1.16",
315+
"numpy>=1.17",
316316
"pillow>=6.2.0",
317317
"pyparsing>=2.2.1",
318318
"python-dateutil>=2.7",

0 commit comments

Comments
 (0)
0