py: drop Python 3.9

Signed-off-by: Filipe Laíns <[email protected]>

Author: FFY00

.github/workflows/test.yml

@@ -24,14 +24,11 @@ jobs:
           - windows-11-arm
           - macos-latest
         python:
-          - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
           - '3.13'
         exclude:
-          - os: windows-11-arm
-            python: '3.9'
           - os: windows-11-arm
             python: '3.10'
       fail-fast: false

pyproject.toml

@@ -31,11 +31,9 @@ classifiers = [
   'Operating System :: Unix',
   'Operating System :: MacOS'
 ]
-requires-python = '>= 3.9'
+requires-python = '>= 3.10'
 dependencies = [
   'colorama; os_name == "nt"',
-  'importlib_metadata; python_version < "3.10"',
-  'importlib_resources; python_version < "3.10"',
 ]
 
 [project.optional-dependencies]

src/pkgconf/__init__.py

@@ -7,7 +7,7 @@
 import sysconfig
 import warnings
 
-from typing import Any, Optional, Union
+from typing import Any
 
 import pkgconf._path_entrypoints
 
@@ -21,7 +21,7 @@
 _CLI_LOGGER = _LOGGER.getChild('cli')
 
 
-def _get_system_executable() -> Optional[pathlib.Path]:
+def _get_system_executable() -> pathlib.Path | None:
     if os.environ.get('PKGCONF_PYPI_EMBEDDED_ONLY'):
         return None
 
@@ -39,7 +39,7 @@ def _get_system_executable() -> Optional[pathlib.Path]:
 
 def get_executable() -> pathlib.Path:
     """Get the pkgconf executable."""
-    executable: Optional[pathlib.Path]
+    executable: pathlib.Path | None
 
     if os.name == 'posix':
         executable_name = 'pkgconf'
@@ -79,7 +79,7 @@ def get_pkg_config_path() -> list[str]:
     return [ep.path for ep in _entry_points()]
 
 
-def run_pkgconf(*args: str, **subprocess_kwargs: Any) -> subprocess.CompletedProcess[Union[bytes, str]]:
+def run_pkgconf(*args: str, **subprocess_kwargs: Any) -> subprocess.CompletedProcess[bytes | str]:
     """Run the pkgconf executable.
 
     :param args: Arguments to pass to the pkgconf call.

src/pkgconf/__main__.py

@@ -6,7 +6,7 @@
 import sysconfig
 import warnings
 
-from typing import Optional, TextIO, Union
+from typing import TextIO
 
 import pkgconf
 
@@ -104,12 +104,12 @@ def _setup_cli():
     pkgconf._CLI_LOGGER.setLevel(logging.INFO)
 
     def _showwarning(
-        message: Union[Warning, str],
+        message: Warning | str,
         category: type[Warning],
         filename: str,
         lineno: int,
-        file: Optional[TextIO] = None,
-        line: Optional[str] = None,
+        file: TextIO | None = None,
+        line: str | None = None,
     ) -> None:  # pragma: no cover
         print(f'{yellow}WARNING{reset} {message}', file=sys.stderr)
 

src/pkgconf/_path_entrypoints.py

@@ -1,5 +1,7 @@
 import contextlib
 import importlib.machinery
+import importlib.metadata
+import importlib.resources
 import importlib.util
 import operator
 import os
@@ -10,20 +12,12 @@
 import types
 import warnings
 
-from collections.abc import Iterable
-from typing import Any, Callable, Optional, ParamSpec, TypeVar
+from collections.abc import Callable, Iterable
+from typing import Any, ParamSpec, TypeVar
 
 import pkgconf
 
 
-if sys.version_info >= (3, 10):
-    import importlib.metadata as importlib_metadata
-    import importlib.resources as importlib_resources
-else:
-    import importlib_metadata
-    import importlib_resources
-
-
 P = ParamSpec('P')
 T = TypeVar('T')
 
@@ -63,7 +57,7 @@ def module_path(name: str) -> str:
         if len(module.__spec__.submodule_search_locations) == 1:
             return module.__spec__.submodule_search_locations[0]
     # Traversables often implement __fspath__, attempt to use it.
-    traversable = importlib_resources.files(module)
+    traversable = importlib.resources.files(module)
     if isinstance(traversable, os.PathLike):
         return os.fsdecode(os.fspath(traversable))
     # Give up :/
@@ -129,7 +123,7 @@ def replace_sys_modules() -> Iterable[None]:
 
 
 class EntryPoint:
-    def __init__(self, entrypoint: importlib_metadata.EntryPoint) -> None:
+    def __init__(self, entrypoint: importlib.metadata.EntryPoint) -> None:
         self._ep = entrypoint
 
     @property
@@ -145,7 +139,7 @@ def group(self) -> str:
         return self._ep.group
 
     @property
-    def dist(self) -> Optional[importlib_metadata.Distribution]:
+    def dist(self) -> importlib.metadata.Distribution | None:
         return self._ep.dist
 
     @property
@@ -180,7 +174,7 @@ def _resolve_via_translation(self) -> str:
 
 
 def entry_points(**select_params: Any) -> list[EntryPoint]:
-    original_eps = importlib_metadata.entry_points(**select_params)
+    original_eps = importlib.metadata.entry_points(**select_params)
     our_eps = map(EntryPoint, original_eps)
     valid_eps = filter(operator.attrgetter('path'), our_eps)
     return sorted(valid_eps, key=operator.attrgetter('name'))
@@ -206,7 +200,7 @@ def _distribution_info(self) -> str:
             info += f' at {metadata_path!r}'
         return info
 
-    def _find_metadata_path(self) -> Optional[str]:
+    def _find_metadata_path(self) -> str | None:
         assert self._entrypoint.dist
         try:
             dist_root = self._entrypoint.dist.locate_file('')