MNT: bump minimum numpy to 2.0

Author: rcomer

ci/minver-requirements.txt

@@ -1,13 +1,13 @@
 # Extra pip requirements for the minimum-version CI run
 
-contourpy==1.0.1
+contourpy==1.2.1
 cycler==0.10
 fonttools==4.22.0
 importlib-resources==3.2.0
 kiwisolver==1.3.2
 meson-python==0.13.2
 meson==1.1.0
-numpy==1.25.0
+numpy==2.0.0
 packaging==20.0
 pillow==9.0.1
 pyparsing==3.0.0

doc/devel/min_dep_policy.rst

@@ -115,7 +115,7 @@ specification of the dependencies.
 ==========  ========  ======
 Matplotlib  Python    NumPy
 ==========  ========  ======
-3.12        3.12      1.25.0
+3.12        3.12      2.0.0
 3.11        3.11      1.25.0
 `3.10`_     3.10      1.23.0
 `3.9`_      3.9       1.23.0

doc/install/dependencies.rst

@@ -21,12 +21,12 @@ mandatory dependencies are automatically installed. This list is mainly for
 reference.
 
 * `Python <https://www.python.org/downloads/>`_ (>= 3.12)
-* `contourpy <https://pypi.org/project/contourpy/>`_ (>= 1.0.1)
+* `contourpy <https://pypi.org/project/contourpy/>`_ (>= 1.2.1)
 * `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)
 * `dateutil <https://pypi.org/project/python-dateutil/>`_ (>= 2.7)
 * `fontTools <https://fonttools.readthedocs.io/en/latest/>`_ (>= 4.22.0)
 * `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.3.1)
-* `NumPy <https://numpy.org>`_ (>= 1.25)
+* `NumPy <https://numpy.org>`_ (>= 2.0)
 * `packaging <https://pypi.org/project/packaging/>`_ (>= 20.0)
 * `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 9.0)
 * `pyparsing <https://pypi.org/project/pyparsing/>`_ (>= 3)

environment.yml

@@ -13,14 +13,14 @@ dependencies:
   - cairocffi
   - c-compiler
   - cxx-compiler
-  - contourpy>=1.0.1
+  - contourpy>=1.2.1
   - cycler>=0.10.0
   - fonttools>=4.22.0
   - importlib-resources>=3.2.0
   - kiwisolver>=1.3.1
   - pybind11>=2.13.2
   - meson-python>=0.13.1
-  - numpy>=1.25
+  - numpy>=2.0
   - pillow>=9
   - pkg-config
   - pygobject

galleries/examples/units/basic_units.py

@@ -18,8 +18,6 @@
 import itertools
 import math
 
-from packaging.version import parse as parse_version
-
 import numpy as np
 
 import matplotlib.ticker as ticker
@@ -170,9 +168,8 @@ def __str__(self):
     def __len__(self):
         return len(self.value)
 
-    if parse_version(np.__version__) >= parse_version('1.20'):
-        def __getitem__(self, key):
-            return TaggedValue(self.value[key], self.unit)
+    def __getitem__(self, key):
+        return TaggedValue(self.value[key], self.unit)
 
     def __iter__(self):
         # Return a generator expression rather than use `yield`, so that

lib/matplotlib/tests/test_axes.py

@@ -1609,9 +1609,6 @@ def test_pcolor_log_scale(fig_test, fig_ref):
     when using pcolor.
     """
     x = np.linspace(0, 1, 11)
-    # Ensuring second x value always falls slightly above 0.1 prevents flakiness with
-    # numpy v1 #30882. This can be removed once we require numpy >= 2.
-    x[1] += 0.00001
     y = np.linspace(1, 2, 5)
     X, Y = np.meshgrid(x, y)
     C = X[:-1, :-1] + Y[:-1, :-1]

lib/matplotlib/tests/test_contour.py

@@ -11,7 +11,6 @@
 from matplotlib.colors import LogNorm, same_color
 import matplotlib.patches as mpatches
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
-from packaging.version import parse as parse_version
 import pytest
 
 
@@ -257,8 +256,7 @@ def test_contour_datetime_axis():
 
 @image_comparison(['contour_test_label_transforms.png'],
                   remove_text=True, style='mpl20',
-                  tol=1 if parse_version(np.version.version).major < 2 else
-                  0 if platform.machine() == 'x86_64' else 0.005)
+                  tol=0 if platform.machine() == 'x86_64' else 0.005)
 def test_labels():
     # Adapted from pylab_examples example code: contour_demo.py
     # see issues #2475, #2843, and #2818 for explanation

lib/matplotlib/tests/test_ticker.py

@@ -6,7 +6,7 @@
 from packaging.version import parse as parse_version
 
 import numpy as np
-from numpy.testing import assert_almost_equal, assert_array_equal, assert_allclose
+from numpy.testing import assert_almost_equal, assert_array_equal
 import pytest
 
 import matplotlib as mpl
@@ -1951,10 +1951,7 @@ def test_bad_locator_subs(sub):
 @mpl.style.context('default')
 def test_small_range_loglocator(numticks, lims, ticks):
     ll = mticker.LogLocator(numticks=numticks)
-    if parse_version(np.version.version).major < 2:
-        assert_allclose(ll.tick_values(*lims), ticks, rtol=2e-16)
-    else:
-        assert_array_equal(ll.tick_values(*lims), ticks)
+    assert_array_equal(ll.tick_values(*lims), ticks)
 
 
 @mpl.style.context('default')

lib/mpl_toolkits/mplot3d/tests/test_axes3d.py

@@ -3,7 +3,6 @@
 import platform
 import sys
 
-from packaging.version import parse as parse_version
 import pytest
 
 from mpl_toolkits.mplot3d import Axes3D, axes3d, proj3d, art3d
@@ -182,8 +181,7 @@ def test_bar3d_shaded():
     fig.canvas.draw()
 
 
-@mpl3d_image_comparison(['bar3d_notshaded.png'], style='mpl20',
-                        tol=0.01 if parse_version(np.version.version).major < 2 else 0)
+@mpl3d_image_comparison(['bar3d_notshaded.png'], style='mpl20')
 def test_bar3d_notshaded():
     fig = plt.figure()
     ax = fig.add_subplot(projection='3d')

pyproject.toml

@@ -30,11 +30,11 @@ classifiers=[
 # - doc/devel/dependencies.rst
 # - environment.yml
 dependencies = [
-    "contourpy >= 1.0.1",
+    "contourpy >= 1.2.1",
     "cycler >= 0.10",
     "fonttools >= 4.22.0",
     "kiwisolver >= 1.3.1",
-    "numpy >= 1.25",
+    "numpy >= 2.0",
     "packaging >= 20.0",
     "pillow >= 9",
     "pyparsing >= 3",
@@ -68,11 +68,11 @@ requires = [
 [dependency-groups]
 build = [
     # Should be the same as `[project] dependencies` above.
-    "contourpy >= 1.0.1",
+    "contourpy >= 1.2.1",
     "cycler >= 0.10",
     "fonttools >= 4.22.0",
     "kiwisolver >= 1.3.1",
-    "numpy >= 1.25",
+    "numpy >= 2.0",
     "packaging >= 20.0",
     "pillow >= 9",
     "pyparsing >= 3",