Merge branch 'main' into feature/no-metadata-exception

jaraco · jaraco · commit 0f2229ca84f2 · 2026-03-19T20:23:38.000-04:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,31 +34,31 @@ jobs:
       # https://blog.jaraco.com/efficient-use-of-ci-resources/
       matrix:
         python:
-        - "3.9"
+        - "3.10"
         - "3.13"
         platform:
         - ubuntu-latest
         - macos-latest
         - windows-latest
         include:
-        - python: "3.10"
-          platform: ubuntu-latest
         - python: "3.11"
           platform: ubuntu-latest
         - python: "3.12"
           platform: ubuntu-latest
         - python: "3.14"
           platform: ubuntu-latest
+        - python: "3.15"
+          platform: ubuntu-latest
         - python: pypy3.10
           platform: ubuntu-latest
     runs-on: ${{ matrix.platform }}
-    continue-on-error: ${{ matrix.python == '3.14' }}
+    continue-on-error: ${{ matrix.python == '3.15' }}
     steps:
       - uses: actions/checkout@v4
       - name: Install build dependencies
         # Install dependencies for building packages on pre-release Pythons
         # jaraco/skeleton#161
-        if: matrix.python == '3.14' && matrix.platform == 'ubuntu-latest'
+        if: matrix.python == '3.15' && matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt update
           sudo apt install -y libxml2-dev libxslt-dev
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,6 +2,6 @@ repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: v0.12.0
   hooks:
-  - id: ruff
+  - id: ruff-check
     args: [--fix, --unsafe-fixes]
   - id: ruff-format
diff --git a/NEWS.rst b/NEWS.rst
@@ -1,3 +1,12 @@
+v8.8.0
+======
+
+Features
+--------
+
+- Removed Python 3.9 compatibility.
+
+
 v8.7.1
 ======
 
diff --git a/importlib_metadata/__init__.py b/importlib_metadata/__init__.py
@@ -39,7 +39,7 @@
 from ._functools import method_cache, noop, pass_none, passthrough
 from ._itertools import always_iterable, bucket, unique_everseen
 from ._meta import PackageMetadata, SimplePath
-from .compat import py39, py311
+from .compat import py311
 
 __all__ = [
     'Distribution',
@@ -345,7 +345,7 @@ def select(self, **params) -> EntryPoints:
         Select entry points from self that match the
         given parameters (typically group and/or name).
         """
-        return EntryPoints(ep for ep in self if py39.ep_matches(ep, **params))
+        return EntryPoints(ep for ep in self if ep.matches(**params))
 
     @property
     def names(self) -> set[str]:
@@ -1106,7 +1106,7 @@ def version(distribution_name: str) -> str:
 
 _unique = functools.partial(
     unique_everseen,
-    key=py39.normalized_name,
+    key=operator.attrgetter('_normalized_name'),
 )
 """
 Wrapper for ``distributions`` to return unique distributions by name.
diff --git a/importlib_metadata/_functools.py b/importlib_metadata/_functools.py
@@ -1,6 +1,7 @@
 import functools
 import types
-from typing import Callable, TypeVar
+from collections.abc import Callable
+from typing import TypeVar
 
 
 # from jaraco.functools 3.3
diff --git a/importlib_metadata/compat/py39.py b/importlib_metadata/compat/py39.py
diff --git a/mypy.ini b/mypy.ini
@@ -22,6 +22,5 @@ ignore_missing_imports = True
 [mypy-zipp.*]
 ignore_missing_imports = True
 
-# jaraco/jaraco.test#7
-[mypy-jaraco.test.*]
+[mypy-test.support.*]
 ignore_missing_imports = True
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ classifiers = [
 	"Programming Language :: Python :: 3",
 	"Programming Language :: Python :: 3 :: Only",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "Apache-2.0"
 dependencies = [
 	"zipp>=3.20",
@@ -39,7 +39,6 @@ test = [
 	"packaging",
 	"pyfakefs",
 	"pytest-perf >= 0.9.2",
-	"jaraco.test >= 5.4",
 ]
 
 doc = [
@@ -58,7 +57,7 @@ doc = [
 perf = ["ipython"]
 
 check = [
-	"pytest-checkdocs >= 2.4",
+	"pytest-checkdocs >= 2.14",
 	"pytest-ruff >= 0.2.1; sys_platform != 'cygwin'",
 ]
 
@@ -72,10 +71,9 @@ enabler = [
 
 type = [
 	# upstream
-	"pytest-mypy >= 1.0.1",
-
-	## workaround for python/mypy#20454
-	"mypy < 1.19; python_implementation == 'PyPy'",
+	
+    # Exclude PyPy from type checks (python/mypy#20454 jaraco/skeleton#187)
+	"pytest-mypy >= 1.0.1; platform_python_implementation != 'PyPy'",
 
 	# local
 ]
diff --git a/tests/compat/py312.py b/tests/compat/py312.py
@@ -1,6 +1,6 @@
 import contextlib
 
-from .py39 import import_helper
+from test.support import import_helper
 
 
 @contextlib.contextmanager
diff --git a/tests/compat/py39.py b/tests/compat/py39.py
diff --git a/tests/compat/test_py39_compat.py b/tests/compat/test_py39_compat.py
diff --git a/tests/fixtures.py b/tests/fixtures.py
@@ -8,9 +8,10 @@
 import textwrap
 from importlib import resources
 
+from test.support import os_helper
+
 from . import _path
 from ._path import FilesSpec
-from .compat.py39 import os_helper
 from .compat.py312 import import_helper
 
 
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -4,6 +4,7 @@
 import unittest
 
 import pyfakefs.fake_filesystem_unittest as ffs
+from test.support import os_helper
 
 import importlib_metadata
 from importlib_metadata import (
@@ -21,7 +22,6 @@
 
 from . import fixtures
 from ._path import Symlink
-from .compat.py39 import os_helper
 
 
 class BasicTests(fixtures.DistInfoPkg, unittest.TestCase):
diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,7 @@ deps =
 	diff-cover
 commands =
 	pytest {posargs} --cov-report xml
-	diff-cover coverage.xml --compare-branch=origin/main --html-report diffcov.html
+	diff-cover coverage.xml --compare-branch=origin/main --format html:diffcov.html
 	diff-cover coverage.xml --compare-branch=origin/main --fail-under=100
 
 [testenv:docs]

-Original file line number
+Diff line change
@@ @@ -1,3 +1,12 @@ @@
 +v8.8.0
 +======
++
 +Features
 +--------
++
 +- Removed Python 3.9 compatibility.
++
++
 v8.7.1
 ======