Bump minimum Python to 3.10

QuLogic · QuLogic · commit 07f95e4393e6 · 2024-07-03T00:13:48.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -216,9 +216,9 @@ commands:
 #
 
 jobs:
-  docs-python39:
+  docs-python310:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.10
     resource_class: large
     steps:
       - checkout
@@ -259,4 +259,4 @@ workflows:
     jobs:
       # NOTE: If you rename this job, then you must update the `if` condition
       # and `circleci-jobs` option in `.github/workflows/circleci.yml`.
-      - docs-python39
+      - docs-python310
diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
@@ -3,7 +3,7 @@ name: "CircleCI artifact handling"
 on: [status]
 jobs:
   circleci_artifacts_redirector_job:
-    if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
+    if: "${{ github.event.context == 'ci/circleci: docs-python310' }}"
     permissions:
       statuses: write
     runs-on: ubuntu-latest
@@ -16,11 +16,11 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           api-token: ${{ secrets.CIRCLECI_TOKEN }}
           artifact-path: 0/doc/build/html/index.html
-          circleci-jobs: docs-python39
+          circleci-jobs: docs-python310
           job-title: View the built docs
 
   post_warnings_as_review:
-    if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
+    if: "${{ github.event.context == 'ci/circleci: docs-python310' }}"
     permissions:
       contents: read
       checks: write
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,15 +50,15 @@ jobs:
         include:
           - name-suffix: "(Minimum Versions)"
             os: ubuntu-20.04
-            python-version: 3.9
+            python-version: 3.10
             extra-requirements: '-c requirements/testing/minver.txt'
-            pyqt5-ver: '==5.12.2 sip==5.0.0'  # oldest versions with a Py3.9 wheel.
-            pyqt6-ver: '==6.1.0 PyQt6-Qt6==6.1.0'
-            pyside2-ver: '==5.15.1'  # oldest version with working Py3.9 wheel.
+            pyqt5-ver: '==5.15.5 sip==6.3.0'  # oldest versions with a Py3.10 wheel.
+            pyqt6-ver: '==6.2.0 PyQt6-Qt6==6.2.0'
+            pyside2-ver: '==5.15.2.1'  # oldest version with working Py3.10 wheel.
             pyside6-ver: '==6.0.0'
             delete-font-cache: true
           - os: ubuntu-20.04
-            python-version: 3.9
+            python-version: '3.10'
             # One CI run tests ipython/matplotlib-inline before backend mapping moved to mpl
             extra-requirements: '-r requirements/testing/extra.txt "ipython==7.19" "matplotlib-inline<0.1.7"'
             CFLAGS: "-fno-lto"  # Ensure that disabling LTO works.
@@ -67,14 +67,6 @@ jobs:
             pyqt6-ver: '!=6.5.1,!=6.6.0'
             # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
             pyside6-ver: '!=6.5.1'
-          - os: ubuntu-20.04
-            python-version: '3.10'
-            extra-requirements: '-r requirements/testing/extra.txt'
-            # https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954
-            # https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
-            pyqt6-ver: '!=6.5.1,!=6.6.0'
-            # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
-            pyside6-ver: '!=6.5.1'
           - os: ubuntu-22.04
             python-version: '3.11'
             # https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
@@ -88,8 +80,8 @@ jobs:
             pyqt6-ver: '!=6.6.0'
             # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
             pyside6-ver: '!=6.5.1'
-          - os: macos-12  # This runnre is on Intel chips.
-            python-version: 3.9
+          - os: macos-12  # This runner is on Intel chips.
+            python-version: 3.10
             # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
             pyside6-ver: '!=6.5.1'
           - os: macos-14  # This runner is on M1 (arm64) chips.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -49,29 +49,20 @@ stages:
       - job: Pytest
         strategy:
           matrix:
-            Linux_py39:
-              vmImage: 'ubuntu-20.04'  # keep one job pinned to the oldest image
-              python.version: '3.9'
             Linux_py310:
-              vmImage: 'ubuntu-latest'
+              vmImage: 'ubuntu-20.04'  # keep one job pinned to the oldest image
               python.version: '3.10'
             Linux_py311:
               vmImage: 'ubuntu-latest'
               python.version: '3.11'
-            macOS_py39:
-              vmImage: 'macOS-latest'
-              python.version: '3.9'
             macOS_py310:
               vmImage: 'macOS-latest'
               python.version: '3.10'
             macOS_py311:
               vmImage: 'macOS-latest'
               python.version: '3.11'
-            Windows_py39:
-              vmImage: 'windows-2019'  # keep one job pinned to the oldest image
-              python.version: '3.9'
             Windows_py310:
-              vmImage: 'windows-latest'
+              vmImage: 'windows-2019'  # keep one job pinned to the oldest image
               python.version: '3.10'
             Windows_py311:
               vmImage: 'windows-latest'
diff --git a/doc/api/next_api_changes/development/28503-ES.rst b/doc/api/next_api_changes/development/28503-ES.rst
@@ -0,0 +1,14 @@
+Increase to minimum supported versions of dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For Matplotlib 3.10, the :ref:`minimum supported versions <dependencies>` are
+being bumped:
+
++------------+-----------------+----------------+
+| Dependency |  min in mpl3.9  | min in mpl3.10 |
++============+=================+================+
+|   Python   |       3.9       |      3.10      |
++------------+-----------------+----------------+
+
+This is consistent with our :ref:`min_deps_policy` and `SPEC0
+<https://scientific-python.org/specs/spec-0000/>`__
diff --git a/doc/install/dependencies.rst b/doc/install/dependencies.rst
@@ -20,7 +20,7 @@ When installing through a package manager like ``pip`` or ``conda``, the
 mandatory dependencies are automatically installed. This list is mainly for
 reference.
 
-* `Python <https://www.python.org/downloads/>`_ (>= 3.9)
+* `Python <https://www.python.org/downloads/>`_ (>= 3.10)
 * `contourpy <https://pypi.org/project/contourpy/>`_ (>= 1.0.1)
 * `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)
 * `dateutil <https://pypi.org/project/python-dateutil/>`_ (>= 2.7)
@@ -30,8 +30,6 @@ reference.
 * `packaging <https://pypi.org/project/packaging/>`_ (>= 20.0)
 * `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 8.0)
 * `pyparsing <https://pypi.org/project/pyparsing/>`_ (>= 2.3.1)
-* `importlib-resources <https://pypi.org/project/importlib-resources/>`_
-  (>= 3.2.0; only required on Python < 3.10)
 
 
 .. _optional_dependencies:
diff --git a/doc/install/index.rst b/doc/install/index.rst
@@ -267,9 +267,9 @@ at the Terminal.app command line::
 
 You should see something like ::
 
-  3.6.0 /Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/site-packages/matplotlib/__init__.py
+  3.10.0 /Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/site-packages/matplotlib/__init__.py
 
-where ``3.6.0`` is the Matplotlib version you just installed, and the path
+where ``3.10.0`` is the Matplotlib version you just installed, and the path
 following depends on whether you are using Python.org Python, Homebrew or
 Macports.  If you see another version, or you get an error like ::
 
diff --git a/galleries/users_explain/customizing.py b/galleries/users_explain/customizing.py
@@ -234,8 +234,8 @@ def plotting_function():
 #
 # 4. :file:`{INSTALL}/matplotlib/mpl-data/matplotlibrc`, where
 #    :file:`{INSTALL}` is something like
-#    :file:`/usr/lib/python3.9/site-packages` on Linux, and maybe
-#    :file:`C:\\Python39\\Lib\\site-packages` on Windows. Every time you
+#    :file:`/usr/lib/python3.10/site-packages` on Linux, and maybe
+#    :file:`C:\\Python310\\Lib\\site-packages` on Windows. Every time you
 #    install matplotlib, this file will be overwritten, so if you want
 #    your customizations to be saved, please move this file to your
 #    user-specific matplotlib directory.
diff --git a/lib/matplotlib/_api/__init__.pyi b/lib/matplotlib/_api/__init__.pyi
@@ -25,9 +25,8 @@ class classproperty(Any):
         fdel: None = ...,
         doc: str | None = None,
     ): ...
-    # Replace return with Self when py3.9 is dropped
     @overload
-    def __get__(self, instance: None, owner: None) -> classproperty: ...
+    def __get__(self, instance: None, owner: None) -> Self: ...
     @overload
     def __get__(self, instance: object, owner: type[object]) -> Any: ...
     @property
diff --git a/lib/matplotlib/_api/deprecation.pyi b/lib/matplotlib/_api/deprecation.pyi
@@ -1,8 +1,7 @@
 from collections.abc import Callable
 import contextlib
-from typing import Any, TypedDict, TypeVar, overload
+from typing import Any, ParamSpec, TypedDict, TypeVar, overload
 from typing_extensions import (
-    ParamSpec,  # < Py 3.10
     Unpack,  # < Py 3.11
 )
 
diff --git a/lib/matplotlib/axis.pyi b/lib/matplotlib/axis.pyi
@@ -93,9 +93,8 @@ class Ticker:
 
 class _LazyTickList:
     def __init__(self, major: bool) -> None: ...
-    # Replace return with Self when py3.9 is dropped
     @overload
-    def __get__(self, instance: None, owner: None) -> _LazyTickList: ...
+    def __get__(self, instance: None, owner: None) -> Self: ...
     @overload
     def __get__(self, instance: Axis, owner: type[Axis]) -> list[Tick]: ...
 
diff --git a/lib/matplotlib/backends/registry.py b/lib/matplotlib/backends/registry.py
@@ -132,14 +132,8 @@ def _read_entry_points(self):
         #   [project.entry-points."matplotlib.backend"]
         #   inline = "matplotlib_inline.backend_inline"
         import importlib.metadata as im
-        import sys
-
-        # entry_points group keyword not available before Python 3.10
-        group = "matplotlib.backend"
-        if sys.version_info >= (3, 10):
-            entry_points = im.entry_points(group=group)
-        else:
-            entry_points = im.entry_points().get(group, ())
+
+        entry_points = im.entry_points(group="matplotlib.backend")
         entries = [(entry.name, entry.value) for entry in entry_points]
 
         # For backward compatibility, if matplotlib-inline and/or ipympl are installed
diff --git a/lib/matplotlib/dviread.pyi b/lib/matplotlib/dviread.pyi
@@ -47,8 +47,7 @@ class Dvi:
     fonts: dict[int, DviFont]
     state: _dvistate
     def __init__(self, filename: str | os.PathLike, dpi: float | None) -> None: ...
-    # Replace return with Self when py3.9 is dropped
-    def __enter__(self) -> Dvi: ...
+    def __enter__(self) -> Self: ...
     def __exit__(self, etype, evalue, etrace) -> None: ...
     def __iter__(self) -> Generator[Page, None, None]: ...
     def close(self) -> None: ...
@@ -83,8 +82,7 @@ class PsFont(NamedTuple):
     filename: str
 
 class PsfontsMap:
-    # Replace return with Self when py3.9 is dropped
-    def __new__(cls, filename: str | os.PathLike) -> PsfontsMap: ...
+    def __new__(cls, filename: str | os.PathLike) -> Self: ...
     def __getitem__(self, texname: bytes) -> PsFont: ...
 
 def find_tex_file(filename: str | os.PathLike) -> str: ...
diff --git a/lib/matplotlib/sankey.pyi b/lib/matplotlib/sankey.pyi
@@ -56,6 +56,5 @@ class Sankey:
         connect: tuple[int, int] = ...,
         rotation: float = ...,
         **kwargs
-        # Replace return with Self when py3.9 is dropped
-    ) -> Sankey: ...
+    ) -> Self: ...
     def finish(self) -> list[Any]: ...
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -12,19 +12,12 @@
 """
 
 import contextlib
+import importlib.resources
 import logging
 import os
 from pathlib import Path
-import sys
 import warnings
 
-if sys.version_info >= (3, 10):
-    import importlib.resources as importlib_resources
-else:
-    # Even though Py3.9 has importlib.resources, it doesn't properly handle
-    # modules added in sys.path.
-    import importlib_resources
-
 import matplotlib as mpl
 from matplotlib import _api, _docstring, _rc_params_in_file, rcParamsDefault
 
@@ -121,8 +114,7 @@ def use(style):
             elif "." in style:
                 pkg, _, name = style.rpartition(".")
                 try:
-                    path = (importlib_resources.files(pkg)
-                            / f"{name}.{STYLE_EXTENSION}")
+                    path = importlib.resources.files(pkg) / f"{name}.{STYLE_EXTENSION}"
                     style = _rc_params_in_file(path)
                 except (ModuleNotFoundError, OSError, TypeError) as exc:
                     # There is an ambiguity whether a dotted name refers to a
diff --git a/lib/matplotlib/tests/test_backend_inline.py b/lib/matplotlib/tests/test_backend_inline.py
@@ -1,7 +1,6 @@
 import os
 from pathlib import Path
 from tempfile import TemporaryDirectory
-import sys
 
 import pytest
 
@@ -13,7 +12,6 @@
 pytest.importorskip('matplotlib_inline')
 
 
-@pytest.mark.skipif(sys.version_info[:2] <= (3, 9), reason="Requires Python 3.10+")
 def test_ipynb():
     nb_path = Path(__file__).parent / 'test_inline_01.ipynb'
 
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
@@ -10,8 +10,7 @@
 import pytest
 
 
-pytest.importorskip('sphinx',
-                    minversion=None if sys.version_info < (3, 10) else '4.1.3')
+pytest.importorskip('sphinx', minversion='4.1.3')
 
 
 def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None):
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,6 @@ classifiers=[
     "License :: OSI Approved :: Python Software Foundation License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -40,9 +39,8 @@ dependencies = [
     "pillow >= 8",
     "pyparsing >= 2.3.1",
     "python-dateutil >= 2.7",
-    "importlib-resources >= 3.2.0; python_version < '3.10'",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 # Should be a copy of the build dependencies below.
@@ -160,7 +158,7 @@ external = [
   "E703",
 ]
 
-target-version = "py39"
+target-version = "py310"
 
 [tool.ruff.pydocstyle]
 convention = "numpy"
diff --git a/requirements/testing/extra.txt b/requirements/testing/extra.txt
@@ -1,4 +1,4 @@
-# Extra pip requirements for the Python 3.9+ builds
+# Extra pip requirements for the Python 3.10+ builds
 
 --prefer-binary
 ipykernel
diff --git a/requirements/testing/mypy.txt b/requirements/testing/mypy.txt
@@ -25,5 +25,3 @@ pyparsing>=2.3.1
 python-dateutil>=2.7
 setuptools_scm>=7
 setuptools>=64
-
-importlib-resources>=3.2.0 ; python_version < "3.10"
diff --git a/tools/boilerplate.py b/tools/boilerplate.py
@@ -27,31 +27,9 @@
 import numpy as np
 from matplotlib import _api, mlab
 from matplotlib.axes import Axes
-from matplotlib.backend_bases import MouseButton
 from matplotlib.figure import Figure
 
 
-# we need to define a custom str because py310 change
-# In Python 3.10 the repr and str representation of Enums changed from
-#
-#  str: 'ClassName.NAME' -> 'NAME'
-#  repr: '<ClassName.NAME: value>' -> 'ClassName.NAME'
-#
-# which is more consistent with what str/repr should do, however this breaks
-# boilerplate which needs to get the ClassName.NAME version in all versions of
-# Python. Thus, we locally monkey patch our preferred str representation in
-# here.
-#
-# bpo-40066
-# https://github.com/python/cpython/pull/22392/
-def enum_str_back_compat_patch(self):
-    return f'{type(self).__name__}.{self.name}'
-
-# only monkey patch if we have to.
-if str(MouseButton.LEFT) != 'MouseButton.Left':
-    MouseButton.__str__ = enum_str_back_compat_patch
-
-
 # This is the magic line that must exist in pyplot, after which the boilerplate
 # content will be appended.
 PYPLOT_MAGIC_HEADER = (
@@ -110,9 +88,6 @@ def __init__(self, value):
             self._repr = "np.mean"
         elif value is _api.deprecation._deprecated_parameter:
             self._repr = "_api.deprecation._deprecated_parameter"
-        elif isinstance(value, Enum):
-            # Enum str is Class.Name whereas their repr is <Class.Name: value>.
-            self._repr = str(value)
         else:
             self._repr = repr(value)
 
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`from collections.abc import Callable`
`2`	`2`	`import contextlib`
`3`		`-from typing import Any, TypedDict, TypeVar, overload`
	`3`	`+from typing import Any, ParamSpec, TypedDict, TypeVar, overload`
`4`	`4`	`from typing_extensions import (`
`5`		`- ParamSpec, # < Py 3.10`
`6`	`5`	`Unpack, # < Py 3.11`
`7`	`6`	`)`
`8`	`7`