DEP: drop support for CPython 3.10

Author: neutrinoceros

.github/workflows/cd.yml

@@ -56,7 +56,7 @@ jobs:
         persist-credentials: false
     - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
       with:
-        python-version: '3.10'
+        python-version: '3.11'
         enable-cache: true
         prune-cache: false
         cache-suffix: test-sdist

.github/workflows/check-pre-commit-hooks.yml

@@ -33,8 +33,8 @@ jobs:
         os:
         - ubuntu-latest
         python-version:
-        - 3.10.0
-        - '3.13'
+        - 3.11.0
+        - '3.14'
         pre-commit-version:
         - 3.8.0 # minimal requirement for pre-commit-uv
         - latest
@@ -54,9 +54,13 @@ jobs:
         path: downstream
         repository: ${{ matrix.downstream }}
         persist-credentials: false
-    - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867   # v7.1.6
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      # 3.11.0 isn't available through setup-uv
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867   # v7.1.6
+      with:
+        enable-cache: false
     - name: Run pre-commit hooks
       # we use pre-commit-uv to ensure that the workspace configuration is read from
       # the root pyproject.toml, so that we run against the dev branch of inifix

.github/workflows/ci.yml

@@ -29,14 +29,17 @@ jobs:
         python-jit: [null]
         include:
         - os: ubuntu-22.04
-          python-version: 3.10.0
+          python-version: 3.11.0
           label: oldestdeps
         - os: macos-latest
-          python-version: 3.10.0
+          python-version: 3.11.0
         - os: macos-latest
           python-version: '3.14'
         - os: windows-latest
-          python-version: 3.10.0
+          # 3.11.0 and 3.11.1 have a platform-specific self-triggered warning
+          # breaking pytest at collection time, and that I don't want to just
+          # ignore unconditionally
+          python-version: 3.11.2
         - os: windows-latest
           python-version: '3.14'
         - os: ubuntu-latest
@@ -54,9 +57,13 @@ jobs:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         persist-credentials: false
-    - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      # 3.11.0 isn't available through setup-uv
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
+    - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      with:
         enable-cache: true
         prune-cache: false
         cache-suffix: covcheck
@@ -98,7 +105,7 @@ jobs:
         os:
         - ubuntu-latest
         python-version:
-        - 3.10.0
+        - 3.11.0
         - '3.14'
         - 3.14t
 
@@ -107,9 +114,12 @@ jobs:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         persist-credentials: false
-    - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      # 3.11.0 isn't available through setup-uv
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      with:
         enable-cache: true
         prune-cache: false
         cache-suffix: concurrency
@@ -159,8 +169,8 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - '3.10'
-        - '3.13'
+        - '3.11'
+        - '3.14'
         typechecker:
         - mypy
         - pyright

lib/inifix/pyproject.toml

@@ -19,7 +19,6 @@ classifiers = [
     "Operating System :: MacOS",
     "Operating System :: Microsoft :: Windows",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -29,11 +28,8 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "Typing :: Typed",
 ]
-requires-python = ">=3.10"
-dependencies = [
-    "exceptiongroup>=1.0.0 ; python_full_version < '3.11'",
-    "typing-extensions>=4.2.0 ; python_full_version < '3.11'",
-]
+requires-python = ">=3.11"
+dependencies = []
 
 [project.readme]
 file = "README.md"

lib/inifix/src/inifix/_floatencoder.py

@@ -1,11 +1,6 @@
 import re
-import sys
 from enum import Enum, auto
-
-if sys.version_info >= (3, 11):
-    from typing import assert_never
-else:
-    from typing_extensions import assert_never
+from typing import assert_never
 
 __all__ = ["FloatEncoder"]
 

lib/inifix/src/inifix/_validation.py

@@ -1,16 +1,9 @@
 import re
-import sys
 from enum import Enum, auto
-from typing import Literal
+from typing import Literal, assert_never
 
 from inifix._typing import AnyConfig
 
-if sys.version_info >= (3, 11):
-    from typing import assert_never
-else:
-    from exceptiongroup import ExceptionGroup
-    from typing_extensions import assert_never
-
 _PARAM_NAME_REGEXP = re.compile(r"[-\.\w]+")
 SCALAR_TYPES = (int, float, bool, str)
 

lib/inifix/tests/test_schema_validation.py

@@ -1,15 +1,10 @@
-import sys
-
 import pytest
 from pytest import RaisesExc, RaisesGroup
 
 from inifix import dump, dumps, load, loads, validate_inifile_schema
 
 from .utils import assert_dict_equal
 
-if sys.version_info < (3, 11):
-    from exceptiongroup import ExceptionGroup
-
 
 def test_validate_known_files(inifile):
     conf = load(inifile)

pyproject.toml

@@ -9,10 +9,9 @@ description = "A command line interface for inifix."
 authors = [
     { name = "C.M.T. Robert" },
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "click>=8.3.1",
-    "exceptiongroup>=1.0.0", # TODO: remove when support for Python 3.10 is dropped
     "inifix==6.1.2",
     "typing-extensions>=4.4.0 ; python_full_version < '3.12'",
 ]
@@ -36,7 +35,6 @@ concurrency = [
 ]
 covcheck = [
     {include-group = "test"},
-    "coverage[toml] ; python_version == '3.10'",
     "coverage>=7.10.0",
 ]
 typecheck = [
@@ -51,12 +49,6 @@ members = ["lib/inifix"]
 [tool.uv.sources]
 inifix = { workspace = true }
 
-[tool.uv]
-constraint-dependencies = [
-    # https://github.com/HypothesisWorks/hypothesis/issues/4602
-    "hypothesis <= 6.144.1; python_full_version < '3.10.2'",
-]
-
 [tool.ruff.lint]
 exclude = ["*__init__.py"]
 ignore = ["E501"]
@@ -108,15 +100,8 @@ reportUnreachable = false
 reportUnnecessaryIsInstance = false
 reportUnnecessaryComparison = false
 
-# in some instances, pyright and basedpyright may conflict over a single line,
-# where e.g. pyright reports an error that I wish to ignore, but basedpyright
-# complains about an unused `# pyright: ignore[...]` comment
-# At the time of writing, it appears that this setting can be lifted once
-# Python 3.10 is unsupported
-reportUnnecessaryTypeIgnoreComment = false
-
 [tool.mypy]
-python_version = "3.10"
+python_version = "3.11"
 strict = true
 show_error_codes = true
 show_error_context = true

scripts/pre_publish_checks.py

@@ -1,14 +1,14 @@
 # /// script
-# requires-python = ">=3.10"
+# requires-python = ">=3.11"
 # dependencies = [
 #     "loguru==0.7.3",
 #     "packaging==24.2",
-#     "tomli==2.2.1 ; python_version < '3.11'",
 # ]
 # ///
 import re
 import subprocess
 import sys
+import tomllib
 from dataclasses import dataclass
 from difflib import unified_diff
 from pathlib import Path
@@ -18,12 +18,6 @@
 from packaging.specifiers import Specifier
 from packaging.version import Version
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
-
 logger.remove()
 logger.add(sys.stderr, colorize=True, format="<level>{level:<5} {message}</level>")
 

src/inifix_cli/__init__.py

@@ -12,16 +12,13 @@
 from textwrap import indent
 import inifix
 
-# TODO: replace this with except* when support for Python 3.10 is dropped
-from exceptiongroup import catch, BaseExceptionGroup
-
 if sys.version_info >= (3, 12):
     from typing import override
 else:
     from typing_extensions import override
 
 if TYPE_CHECKING:
-    from inifix._typing import AnyConfig  # pyright: ignore[reportPrivateImportUsage]
+    from inifix._typing import AnyConfig
 
 
 @click.group("inifix")
@@ -45,7 +42,7 @@ def get_cpu_count() -> int:
         base_cpu_count = os.process_cpu_count()
     elif hasattr(os, "sched_getaffinity"):
         # this function isn't available on all platforms
-        base_cpu_count = len(os.sched_getaffinity(0))  # pyright: ignore[reportAttributeAccessIssue]
+        base_cpu_count = len(os.sched_getaffinity(0))
     else:  # pragma: no cover
         # this proxy is good enough in most situations
         base_cpu_count = os.cpu_count()
@@ -107,19 +104,17 @@ def _validate_single_file(file: str, sections: SectionsArg) -> TaskResults:
         messages.append(Message(f"Error: could not find {file}"))
         return TaskResults(status, messages)
 
-    # TODO: rewrite this section with try/except*/else when support for Python 3.10 is dropped
-    def value_error_handler(exc: BaseExceptionGroup[Exception]) -> None:
-        nonlocal status
+    # mypy struggles to infer sections.name
+    sections_name = cast("Literal['allow', 'forbid', 'require']", sections.name)  # pyright: ignore[reportUnnecessaryCast] # ty: ignore[redundant-cast]
+    try:
+        _ = inifix.load(file, sections=sections_name)
+    except* ValueError as excgroup:
         status = 1
-        exc_repr = "\n".join(str(e) for e in exc.exceptions)
+        exc_repr = "\n".join(str(e) for e in excgroup.exceptions)
         messages.append(
             Message(f"Failed to validate {file}:\n{indent(exc_repr, '  ')}")
         )
-
-    with catch({ValueError: value_error_handler}):
-        # mypy struggles to infer sections.name
-        sections_name = cast("Literal['allow', 'forbid', 'require']", sections.name)  # pyright: ignore[reportUnnecessaryCast] # ty: ignore[redundant-cast]
-        _ = inifix.load(file, sections=sections_name)
+    else:
         messages.append(Message(f"Validated {file}"))
 
     return TaskResults(status, messages)
@@ -195,19 +190,16 @@ def _format_single_file(
 
     validate_baseline: AnyConfig = {}
     if not skip_validation:
-        # TODO: rewrite this section with try/except* when support for Python 3.10 is dropped
-        def value_error_handler(exc: BaseExceptionGroup[Exception]) -> None:
-            nonlocal status
+        # mypy struggles to infer sections.name
+        sections_name = cast("Literal['allow', 'forbid', 'require']", sections.name)  # pyright: ignore[reportUnnecessaryCast] # ty: ignore[redundant-cast]
+        try:
+            validate_baseline = inifix.load(file, sections=sections_name)
+        except* ValueError as excgroup:
             status = 1
-            exc_repr = "\n".join(str(e) for e in exc.exceptions)
+            exc_repr = "\n".join(str(e) for e in excgroup.exceptions)
             messages.append(
                 Message(f"Failed to format {file}:\n{indent(exc_repr, '  ')}")
             )
-
-        with catch({ValueError: value_error_handler}):
-            # mypy struggles to infer sections.name
-            sections_name = cast("Literal['allow', 'forbid', 'require']", sections.name)  # pyright: ignore[reportUnnecessaryCast] # ty: ignore[redundant-cast]
-            validate_baseline = inifix.load(file, sections=sections_name)
         if status != 0:
             return TaskResults(status, messages)