Adopt minimum of python 3.14 (#173)

nikobockerman · web-flow · commit 94fc312091cd · 2025-10-14T21:56:33.000+03:00
* Require &gt;=3.14 python

* Fix new ruff errors

* Remove obsolete __future__ annotations imports
diff --git a/aoc-main/pyproject.toml b/aoc-main/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "aoc-main"
 version = "0.1.0"
-requires-python = ">=3.13"
+requires-python = ">=3.14"
 dependencies = [
   "pyyaml==6.0.3"
 ]
diff --git a/aoc-main/src/aoc_main/_answers.py b/aoc-main/src/aoc_main/_answers.py
@@ -1,11 +1,13 @@
 import functools
-from collections.abc import Iterator
-from typing import NewType, overload
+from typing import TYPE_CHECKING, NewType, overload
 
 import yaml
 
 from aoc_main import _solvers, _types, _utils
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 AnswerIntType = NewType("AnswerIntType", int)
 AnswerStrType = NewType("AnswerStrType", str)
 AnswerType = AnswerIntType | AnswerStrType
diff --git a/aoc-main/src/aoc_main/_exec_solver.py b/aoc-main/src/aoc_main/_exec_solver.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import asyncio
 import os
 import shutil
diff --git a/aoc-main/src/aoc_main/_inputs.py b/aoc-main/src/aoc_main/_inputs.py
@@ -1,7 +1,10 @@
-import pathlib
+from typing import TYPE_CHECKING
 
 from aoc_main import _types, _utils
 
+if TYPE_CHECKING:
+    import pathlib
+
 
 def get_input_file_path(year: _types.Year, day: _types.Day) -> pathlib.Path:
     return _utils.get_repo_root() / "inputs" / f"{year}-{day:02}.txt"
diff --git a/aoc-main/src/aoc_main/_solver_cpp.py b/aoc-main/src/aoc_main/_solver_cpp.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import asyncio
 import json
 import os
diff --git a/aoc-main/src/aoc_main/_solver_python.py b/aoc-main/src/aoc_main/_solver_python.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import asyncio
 import os
 
diff --git a/aoc-main/src/aoc_main/_solver_rust.py b/aoc-main/src/aoc_main/_solver_rust.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import asyncio
 import json
 import os
diff --git a/aoc-main/src/aoc_main/_solvers.py b/aoc-main/src/aoc_main/_solvers.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import enum
 import functools
 from dataclasses import dataclass
diff --git a/aoc-main/src/aoc_main/main.py b/aoc-main/src/aoc_main/main.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import asyncio
 import logging
 import sys
diff --git a/aoc-main/uv.lock b/aoc-main/uv.lock
diff --git a/mise-tasks/check/shellcheck-config-enabled-optional-checks.py b/mise-tasks/check/shellcheck-config-enabled-optional-checks.py
@@ -4,7 +4,10 @@
 import pathlib
 import subprocess
 import sys
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
 
 DISABLED_OPTIONAL_CHECKS = ["check-unassigned-uppercase"]
 
diff --git a/ruff.toml b/ruff.toml
@@ -1,7 +1,7 @@
 extend-exclude = [
   "solvers/cpp/cmake-conan/**"
 ]
-target-version = "py313"
+target-version = "py314"
 
 [lint]
 select = ["ALL"]
diff --git a/solvers/python/pyproject.toml b/solvers/python/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "aoc"
 version = "0.1.0"
-requires-python = ">=3.13"
+requires-python = ">=3.14"
 dependencies = [
   "attrs ==25.4.0",
 ]
diff --git a/solvers/python/src/aoc/tooling/coordinates.py b/solvers/python/src/aoc/tooling/coordinates.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import math
 from typing import NamedTuple, NewType, assert_never
 
diff --git a/solvers/python/src/aoc/tooling/digraph.py b/solvers/python/src/aoc/tooling/digraph.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import typing
 from functools import cache
 from typing import Protocol, runtime_checkable
diff --git a/solvers/python/src/aoc/tooling/directions.py b/solvers/python/src/aoc/tooling/directions.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from enum import StrEnum, auto
 from typing import assert_never
 
diff --git a/solvers/python/src/aoc/tooling/map.py b/solvers/python/src/aoc/tooling/map.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import enum
 from typing import TYPE_CHECKING, Literal, assert_never, overload
 
diff --git a/solvers/python/src/aoc/tooling/run.py b/solvers/python/src/aoc/tooling/run.py
@@ -2,8 +2,10 @@
 import logging
 import pathlib
 import sys
-from collections.abc import Callable
-from typing import Literal, TypeIs
+from typing import TYPE_CHECKING, Literal, TypeIs
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
 
 def is_part(n: int) -> TypeIs[Literal[1, 2]]:
diff --git a/solvers/python/src/aoc/y2023/d01.py b/solvers/python/src/aoc/y2023/d01.py
@@ -1,7 +1,10 @@
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _logger = get_logger()
 
 _STR_DIGITS = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine"]
diff --git a/solvers/python/src/aoc/y2023/d02.py b/solvers/python/src/aoc/y2023/d02.py
@@ -1,7 +1,10 @@
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d03.py b/solvers/python/src/aoc/y2023/d03.py
@@ -1,9 +1,12 @@
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from attrs import Factory, define, field
 
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d04.py b/solvers/python/src/aoc/y2023/d04.py
@@ -1,10 +1,13 @@
 from collections import Counter
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from attrs import define
 
 from aoc.tooling.run import run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 @define
 class _InputCards:
diff --git a/solvers/python/src/aoc/y2023/d05.py b/solvers/python/src/aoc/y2023/d05.py
@@ -1,10 +1,13 @@
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from attrs import Factory, define, field
 
 from aoc.tooling.ranges import are_ranges_overlapping, partition_range
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d06.py b/solvers/python/src/aoc/y2023/d06.py
@@ -1,9 +1,12 @@
 import enum
-from collections.abc import Iterable
 from functools import reduce
+from typing import TYPE_CHECKING
 
 from aoc.tooling.run import run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 def _parse_input(lines: list[str]) -> list[tuple[int, int]]:
     times = map(int, lines[0][5:].strip().split())
diff --git a/solvers/python/src/aoc/y2023/d07.py b/solvers/python/src/aoc/y2023/d07.py
@@ -1,13 +1,16 @@
 import enum
 from collections import Counter
-from collections.abc import Iterable
 from functools import total_ordering
-from types import NotImplementedType
+from typing import TYPE_CHECKING
 
 from attrs import define
 
 from aoc.tooling.run import run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+    from types import NotImplementedType
+
 
 def _parse_input(lines: Iterable[str]) -> Iterable[tuple[str, int]]:
     for line in lines:
@@ -25,7 +28,7 @@ class _HandType(enum.Enum):
     FourOfAKind = 5
     FiveOfAKind = 6
 
-    def __lt__(self, other: "_HandType") -> bool | NotImplementedType:
+    def __lt__(self, other: _HandType) -> bool | NotImplementedType:
         if self.__class__ is other.__class__:
             return self.value < other.value
         return NotImplemented
@@ -37,7 +40,7 @@ class _Hand:
     hand_type: _HandType
     bid: int
 
-    def __lt__(self, other: "_Hand") -> bool:
+    def __lt__(self, other: _Hand) -> bool:
         if self.hand_type != other.hand_type:
             return self.hand_type < other.hand_type
 
diff --git a/solvers/python/src/aoc/y2023/d08.py b/solvers/python/src/aoc/y2023/d08.py
@@ -1,11 +1,14 @@
 import itertools
 import math
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from attrs import define
 
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d09.py b/solvers/python/src/aoc/y2023/d09.py
@@ -1,8 +1,11 @@
 import itertools
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from aoc.tooling.run import run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 def _parse_input(lines: Iterable[str]) -> Iterable[list[int]]:
     for line in lines:
diff --git a/solvers/python/src/aoc/y2023/d10.py b/solvers/python/src/aoc/y2023/d10.py
@@ -1,7 +1,7 @@
 import enum
 import itertools
 import logging
-from collections.abc import Collection, Iterable
+from typing import TYPE_CHECKING
 
 from attrs import define, field
 
@@ -11,6 +11,9 @@
 from aoc.tooling.map import Map2d
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Collection, Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d11.py b/solvers/python/src/aoc/y2023/d11.py
@@ -1,10 +1,13 @@
 import contextlib
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from aoc.tooling.coordinates import Coord2d
 from aoc.tooling.map import Map2d
 from aoc.tooling.run import run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class _InputMap(Map2d):
     def __init__(self, data: Iterable[str]) -> None:
diff --git a/solvers/python/src/aoc/y2023/d12.py b/solvers/python/src/aoc/y2023/d12.py
@@ -1,11 +1,13 @@
 import itertools
-from collections.abc import Iterable
-from typing import Literal
+from typing import TYPE_CHECKING, Literal
 
 from attrs import frozen
 
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d13.py b/solvers/python/src/aoc/y2023/d13.py
@@ -1,10 +1,13 @@
 import itertools
-from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from aoc.tooling.coordinates import X, Y
 from aoc.tooling.map import IterDirection, Map2d
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d14.py b/solvers/python/src/aoc/y2023/d14.py
@@ -1,12 +1,14 @@
 import logging
-from collections.abc import Callable, Iterable
-from typing import Literal, overload, override
+from typing import TYPE_CHECKING, Literal, overload, override
 
 from aoc.tooling.coordinates import Coord2d, X, Y
 from aoc.tooling.directions import CardinalDirection as Dir
 from aoc.tooling.map import IterDirection, Map2d
 from aoc.tooling.run import get_logger, run
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Iterable
+
 _logger = get_logger()
 
 
diff --git a/solvers/python/src/aoc/y2023/d17.py b/solvers/python/src/aoc/y2023/d17.py
diff --git a/solvers/python/src/aoc/y2023/d18.py b/solvers/python/src/aoc/y2023/d18.py
diff --git a/solvers/python/src/aoc/y2023/d20.py b/solvers/python/src/aoc/y2023/d20.py
diff --git a/solvers/python/uv.lock b/solvers/python/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[project]`
`2`	`2`	`name = "aoc-main"`
`3`	`3`	`version = "0.1.0"`
`4`		`-requires-python = ">=3.13"`
	`4`	`+requires-python = ">=3.14"`
`5`	`5`	`dependencies = [`
`6`	`6`	`"pyyaml==6.0.3"`
`7`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import annotations`
`2`		`-`
`3`	`1`	`import asyncio`
`4`	`2`	`import os`
`5`	`3`	`import shutil`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import annotations`
`2`		`-`
`3`	`1`	`import enum`
`4`	`2`	`import functools`
`5`	`3`	`from dataclasses import dataclass`