DEP: drop support for Python 3.10

Author: neutrinoceros

.github/workflows/cd.yml

@@ -49,7 +49,7 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
       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

@@ -31,7 +31,7 @@ jobs:
         os:
         - ubuntu-latest
         python-version:
-        - 3.10.0
+        - '3.11'
         - '3.13'
         pre-commit-version:
         - 3.8.0 # minimal requirement for pre-commit-uv

.github/workflows/ci.yml

@@ -16,19 +16,18 @@ jobs:
         os:
         - ubuntu-latest
         python-version:
-        - '3.11'
         - '3.12'
         - '3.13'
         include:
         - os: ubuntu-22.04
-          python-version: 3.10.0
+          python-version: '3.11'
           label: oldestdeps
         - os: macos-latest
-          python-version: 3.10.0
+          python-version: '3.11'
         - os: macos-latest
           python-version: '3.13'
         - os: windows-latest
-          python-version: 3.10.0
+          python-version: '3.11'
         - os: windows-latest
           python-version: '3.13'
 
@@ -75,7 +74,7 @@ jobs:
         os:
         - ubuntu-latest
         python-version:
-        - 3.10.0
+        - '3.11'
         - '3.13'
         - 3.13t
 
@@ -131,7 +130,7 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - '3.10'
+        - '3.11'
         - '3.13'
         typechecker:
         - mypy

lib/inifix/pyproject.toml

@@ -14,11 +14,8 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "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.license]
 text = "GPL-3.0"

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,9 +9,8 @@ description = "A command line interface for inifix."
 authors = [
     { name = "C.M.T. Robert" },
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
-    "exceptiongroup>=1.0.0", # TDOO: remove when support for Python 3.10 is dropped
     "inifix==6.1.1",
     "typer-slim>=0.15.1",
 ]
@@ -35,8 +34,7 @@ concurrency = [
 ]
 covcheck = [
     {include-group = "test"},
-    "coverage[toml]>=6.5.0 ; python_version == '3.10'",
-    "coverage>=6.5.0 ; python_version >= '3.11'",
+    "coverage>=6.5.0",
 ]
 typecheck = [
     "basedpyright>=1.26.0",
@@ -104,15 +102,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

@@ -10,11 +10,8 @@
 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 TYPE_CHECKING:  # pragma: no cover
-    from inifix._typing import AnyConfig  # pyright: ignore[reportPrivateImportUsage]
+    from inifix._typing import AnyConfig
 
 
 __all__ = ["app"]
@@ -39,7 +36,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()
@@ -82,19 +79,16 @@ 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
+    try:
+        _ = inifix.load(file, sections=sections.value)
+        messages.append(Message(f"Validated {file}"))
+    except* ValueError as exc:
         status = 1
         exc_repr = "\n".join(str(e) for e in exc.exceptions)
         messages.append(
             Message(f"Failed to validate {file}:\n{indent(exc_repr, '  ')}")
         )
 
-    with catch({ValueError: value_error_handler}):
-        _ = inifix.load(file, sections=sections.value)
-        messages.append(Message(f"Validated {file}"))
-
     return TaskResults(status, messages)
 
 
@@ -168,17 +162,14 @@ 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
+        try:
+            validate_baseline = inifix.load(file, sections=sections.value)
+        except* ValueError as exc:
             status = 1
             exc_repr = "\n".join(str(e) for e in exc.exceptions)
             messages.append(
                 Message(f"Failed to format {file}:\n{indent(exc_repr, '  ')}")
             )
-
-        with catch({ValueError: value_error_handler}):
-            validate_baseline = inifix.load(file, sections=sections.value)
         if status != 0:
             return TaskResults(status, messages)