Drop support for Python 3.9

Author: oprypin

.github/workflows/ci.yml

@@ -34,12 +34,8 @@ jobs:
           - python: '3.11'
             os: macos-latest
           - python: '3.10'
-            os: ubuntu-latest
-          - python: '3.10'
-            os: macos-latest
-          - python: '3.9'
             os: windows-latest
-          - python: '3.9'
+          - python: '3.10'
             os: ubuntu-latest
             versions: minimal
     runs-on: ${{matrix.os}}

properdocs/config/config_options.py

@@ -10,9 +10,9 @@
 import types
 import warnings
 from collections import Counter, UserString
-from collections.abc import Collection, Iterator, Mapping, MutableMapping
+from collections.abc import Callable, Collection, Iterator, Mapping, MutableMapping
 from types import SimpleNamespace
-from typing import Any, Callable, Generic, NamedTuple, TypeVar, Union, overload
+from typing import Any, Generic, NamedTuple, TypeVar, Union, overload
 from urllib.parse import quote as urlquote
 from urllib.parse import urlsplit, urlunsplit
 

properdocs/livereload/__init__.py

@@ -21,8 +21,8 @@
 import webbrowser
 import wsgiref.simple_server
 import wsgiref.util
-from collections.abc import Iterable
-from typing import Any, BinaryIO, Callable
+from collections.abc import Callable, Iterable
+from typing import Any, BinaryIO
 
 import watchdog.events
 import watchdog.observers.polling

properdocs/plugins.py

@@ -3,14 +3,9 @@
 from __future__ import annotations
 
 import logging
-import sys
-from collections.abc import MutableMapping
-from typing import TYPE_CHECKING, Any, Callable, Generic, Literal, TypeVar, overload
-
-if sys.version_info >= (3, 10):
-    from importlib.metadata import EntryPoint, entry_points
-else:
-    from importlib_metadata import EntryPoint, entry_points
+from collections.abc import Callable, MutableMapping
+from importlib.metadata import EntryPoint, entry_points
+from typing import TYPE_CHECKING, Any, Generic, Literal, TypeVar, overload
 
 if TYPE_CHECKING:
     import jinja2.environment
@@ -33,7 +28,9 @@
     from properdocs.utils.templates import TemplateContext
 
 if TYPE_CHECKING:
-    from typing_extensions import Concatenate, ParamSpec
+    from typing import Concatenate
+
+    from typing_extensions import ParamSpec
 else:
     ParamSpec = TypeVar
 

properdocs/structure/files.py

@@ -7,10 +7,10 @@
 import posixpath
 import shutil
 import warnings
-from collections.abc import Iterable, Iterator, Mapping, Sequence
+from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
 from functools import cached_property
 from pathlib import PurePath, PurePosixPath
-from typing import TYPE_CHECKING, Callable, overload
+from typing import TYPE_CHECKING, overload
 from urllib.parse import quote as urlquote
 
 import pathspec

properdocs/structure/pages.py

@@ -4,8 +4,8 @@
 import logging
 import posixpath
 import warnings
-from collections.abc import Iterator, MutableMapping, Sequence
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable, Iterator, MutableMapping, Sequence
+from typing import TYPE_CHECKING, Any
 from urllib.parse import unquote as urlunquote
 from urllib.parse import urljoin, urlsplit, urlunsplit
 

properdocs/tests/structure/file_tests.py

@@ -1,3 +1,4 @@
+import itertools
 import os
 import sys
 import unittest
@@ -64,7 +65,7 @@ def test_file_sort_key(self):
         ]:
             with self.subTest(case):
                 files = [File(f, "", "", use_directory_urls=True) for f in case]
-                for a, b in zip(files, files[1:]):
+                for a, b in itertools.pairwise(files):
                     self.assertLess(file_sort_key(a), file_sort_key(b))
 
     def test_md_file(self):

properdocs/tests/structure/page_tests.py

@@ -784,11 +784,9 @@ def get_rendered_result(
                 pg.render(cfg, Files(fs))
             msgs = [f'{r.levelname}:{r.message}' for r in cm.records]
             self.assertEqual('\n'.join(msgs), textwrap.dedent(logs).strip('\n'))
-        elif sys.version_info >= (3, 10):
+        else:
             with self.assertNoLogs('properdocs.structure.pages'):
                 pg.render(cfg, Files(fs))
-        else:
-            pg.render(cfg, Files(fs))
 
         assert pg.content is not None
         content = pg.content

properdocs/utils/__init__.py

@@ -13,20 +13,16 @@
 import posixpath
 import re
 import shutil
-import sys
 import warnings
+from bisect import insort  # noqa: F401 - legacy re-export
 from collections import defaultdict
-from collections.abc import Collection, Iterable, MutableSequence
+from collections.abc import Collection, Iterable
 from datetime import datetime, timezone
+from importlib.metadata import EntryPoint, entry_points
 from pathlib import PurePath
 from typing import TYPE_CHECKING, TypeVar
 from urllib.parse import urlsplit
 
-if sys.version_info >= (3, 10):
-    from importlib.metadata import EntryPoint, entry_points
-else:
-    from importlib_metadata import EntryPoint, entry_points
-
 from properdocs import exceptions
 from properdocs.utils.yaml import get_yaml_loader, yaml_load  # noqa: F401 - legacy re-export
 
@@ -93,18 +89,6 @@ def reduce_list(data_set: Iterable[T]) -> list[T]:
     return list(dict.fromkeys(data_set))
 
 
-if sys.version_info >= (3, 10):
-    from bisect import insort
-else:
-
-    def insort(a: MutableSequence[T], x: T, *, key=lambda v: v) -> None:
-        kx = key(x)
-        i = len(a)
-        while i > 0 and kx < key(a[i - 1]):
-            i -= 1
-        a.insert(i, x)
-
-
 def copy_file(source_path: str, output_path: str) -> None:
     """
     Copy source_path to output_path, making sure any parent directories exist.

properdocs/utils/cache.py

@@ -1,6 +1,6 @@
 import datetime
 import urllib.request
-from typing import Callable
+from collections.abc import Callable
 
 import mkdocs_get_deps.cache