drop python 3.9 support and fix pyproject toml

Author: johannes-moegerle

.github/workflows/testing.yml

@@ -10,7 +10,7 @@ jobs:
   pytest-with-nbmake:
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:

README.md

@@ -16,7 +16,7 @@
 
 The *RydState* software calculates properties of Rydberg states.
 We especially focus on the calculation of the radial wavefunction of Rydberg states via the Numerov method.
-The software can be installed via pip (requires Python >= 3.9):
+The software can be installed via pip (requires Python >= 3.10):
 
 ```bash
 pip install rydstate

pyproject.toml

@@ -24,7 +24,6 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
@@ -33,7 +32,7 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Physics",
   "Typing :: Typed",
 ]
-requires-python = ">= 3.9"
+requires-python = ">= 3.10"
 dependencies = [
     "numpy >= 2.0",
     "numba >= 0.60",
@@ -47,7 +46,6 @@ dependencies = [
 tests = [
   "pytest >= 8.0",
   "nbmake >= 1.3",
-  "rydstate[comparison]",
 ]
 docs = [
   "sphinx >= 7",
@@ -72,7 +70,7 @@ mypy = [
 
 [dependency-groups]
 dev = [
-  "rydstate[docs,tests,comparison,jupyter,mypy]",
+  "rydstate[docs,tests,jupyter,mypy]",
   "check-wheel-contents >= 0.6",
 ]
 
@@ -108,7 +106,7 @@ addopts = [
 
 [tool.ruff]
 line-length = 120
-target-version = "py39"
+target-version = "py310"
 extend-include = ["*.ipynb"]
 
 [tool.ruff.lint]

src/rydstate/angular/angular_ket.py

@@ -145,7 +145,7 @@ def __setattr__(self, key: str, value: object) -> None:
         super().__setattr__(key, value)
 
     def __repr__(self) -> str:
-        args = ", ".join(f"{qn}={val}" for qn, val in zip(self.quantum_number_names, self.quantum_numbers))
+        args = ", ".join(f"{qn}={val}" for qn, val in zip(self.quantum_number_names, self.quantum_numbers, strict=True))
         if self.m is not None:
             args += f", m={self.m}"
         return f"{self.__class__.__name__}({args})"

src/rydstate/angular/angular_matrix_element.py

@@ -2,15 +2,16 @@
 
 import math
 from functools import lru_cache
-from typing import TYPE_CHECKING, Callable, Literal, TypeVar, get_args
+from typing import TYPE_CHECKING, Literal, TypeGuard, TypeVar, get_args
 
 import numpy as np
-from typing_extensions import TypeGuard
 
 from rydstate.angular.utils import minus_one_pow
 from rydstate.angular.wigner_symbols import calc_wigner_3j, calc_wigner_6j
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from typing_extensions import ParamSpec
 
     P = ParamSpec("P")

src/rydstate/angular/angular_state.py

@@ -49,7 +49,7 @@ def __init__(
             self.coefficients /= self.norm
 
     def __iter__(self) -> Iterator[tuple[float, _AngularKet]]:
-        return zip(self.coefficients, self.kets).__iter__()
+        return zip(self.coefficients, self.kets, strict=True).__iter__()
 
     def __repr__(self) -> str:
         terms = [f"{coeff}*{ket!r}" for coeff, ket in self]

src/rydstate/angular/wigner_symbols.py

@@ -2,7 +2,7 @@
 
 import math
 from functools import lru_cache, wraps
-from typing import TYPE_CHECKING, Callable, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from sympy import Integer
 from sympy.physics.wigner import (
@@ -14,6 +14,8 @@
 from rydstate.angular.utils import minus_one_pow
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from typing_extensions import ParamSpec
 
     P = ParamSpec("P")

src/rydstate/radial/numerov.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 from numba import njit
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
 
     from rydstate.units import NDArray
 

src/rydstate/radial/wavefunction.py

@@ -3,7 +3,7 @@
 import logging
 import math
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Literal
 
 import numpy as np
 from mpmath import whitw
@@ -19,7 +19,7 @@
 
 logger = logging.getLogger(__name__)
 
-WavefunctionSignConvention = Optional[Literal["positive_at_outer_bound", "n_l_1"]]
+WavefunctionSignConvention = Literal["positive_at_outer_bound", "n_l_1"] | None
 
 
 class Wavefunction(ABC):

src/rydstate/units.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Literal, Union
+from typing import TYPE_CHECKING, Any, Literal
 
 from pint import UnitRegistry
 
 if TYPE_CHECKING:
+    from typing import TypeAlias
+
     import numpy.typing as npt
     from pint.facets.plain import PlainQuantity, PlainUnit
-    from typing_extensions import TypeAlias
 
     NDArray: TypeAlias = npt.NDArray[Any]
     PintFloat: TypeAlias = PlainQuantity[float]
@@ -48,7 +49,7 @@
     "arbitrary",
     "zero",
 ]
-DimensionLike = Union[Dimension, tuple[Dimension, Dimension]]
+DimensionLike = Dimension | tuple[Dimension, Dimension]
 
 # some abbreviations: au_time: atomic_unit_of_time; au_current: atomic_unit_of_current; m_e: electron_mass
 _CommonUnits: dict[Dimension, str] = {