Bump other 39 -> 310 related things

Author: IvanIsCoding

pyproject.toml

@@ -28,7 +28,7 @@ packages = ["rustworkx", "rustworkx.visualization"]
 include-package-data = true
 
 [tool.distutils.bdist_wheel]
-py-limited-api = "cp39"
+py-limited-api = "cp310"
 
 [[tool.setuptools-rust.ext-modules]]
 target = "rustworkx.rustworkx"
@@ -104,7 +104,7 @@ releaseinfra = [
 
 [tool.black]
 line-length = 100
-target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
+target-version = ['py310', 'py311', 'py312', 'py313']
 
 [tool.ruff]
 line-length = 105 # more lenient than black due to long function signatures
@@ -116,7 +116,7 @@ lint.select = [
     "PYI", # flake8-pyi
     "Q",   # flake8-quotes
 ]
-target-version = "py39"
+target-version = "py310"
 extend-exclude = ["doc"]
 
 [tool.ruff.lint.per-file-ignores]

rustworkx/__init__.pyi

@@ -13,7 +13,8 @@ import sys
 import numpy as np
 import numpy.typing as npt
 
-from typing import Generic, Any, Callable, overload
+from typing import Generic, Any, overload
+from collections.abc import Callable
 from collections.abc import Iterable, Iterator, Sequence
 
 if sys.version_info >= (3, 13):
@@ -304,7 +305,7 @@ _BFSVisitor = TypeVar("_BFSVisitor", bound=visit.BFSVisitor)
 _DFSVisitor = TypeVar("_DFSVisitor", bound=visit.DFSVisitor)
 _DijkstraVisitor = TypeVar("_DijkstraVisitor", bound=visit.DijkstraVisitor)
 
-class PyDAG(Generic[_S, _T], PyDiGraph[_S, _T]): ...
+class PyDAG(PyDiGraph[_S, _T], Generic[_S, _T]): ...
 
 def distance_matrix(
     graph: PyGraph | PyDiGraph,

rustworkx/rustworkx.pyi

@@ -12,12 +12,12 @@
 from .visit import BFSVisitor, DFSVisitor, DijkstraVisitor
 from types import GenericAlias
 from typing import (
-    Callable,
     final,
     Any,
     Generic,
     overload,
 )
+from collections.abc import Callable
 from collections.abc import (
     Iterable,
     Iterator,
@@ -1151,7 +1151,7 @@ def dominance_frontiers(graph: PyDiGraph[_S, _T], start_node: int, /) -> dict[in
 
 _T_co = TypeVar("_T_co", covariant=True, default=Any)
 
-class _RustworkxCustomVecIter(Generic[_T_co], Sequence[_T_co], ABC):
+class _RustworkxCustomVecIter(Sequence[_T_co], ABC, Generic[_T_co]):
     def __init__(self) -> None: ...
     def __eq__(self, other: object) -> bool: ...
     @overload
@@ -1169,7 +1169,7 @@ class _RustworkxCustomVecIter(Generic[_T_co], Sequence[_T_co], ABC):
     def __iter__(self) -> Iterator[_T_co]: ...
     def __reversed__(self) -> Iterator[_T_co]: ...
 
-class _RustworkxCustomHashMapIter(Generic[_S, _T_co], Mapping[_S, _T_co], ABC):
+class _RustworkxCustomHashMapIter(Mapping[_S, _T_co], ABC, Generic[_S, _T_co]):
     def __init__(self) -> None: ...
     def items(self) -> ItemsView[_S, _T_co]: ...
     def keys(self) -> KeysView[_S]: ...
@@ -1200,13 +1200,13 @@ class AllPairsPathLengthMapping(_RustworkxCustomHashMapIter[int, PathLengthMappi
 class AllPairsPathMapping(_RustworkxCustomHashMapIter[int, PathMapping]): ...
 
 @final
-class BFSSuccessors(Generic[_T_co], _RustworkxCustomVecIter[tuple[_T_co, list[_T_co]]]): ...
+class BFSSuccessors(_RustworkxCustomVecIter[tuple[_T_co, list[_T_co]]], Generic[_T_co]): ...
 
 @final
-class BFSPredecessors(Generic[_T_co], _RustworkxCustomVecIter[tuple[_T_co, list[_T_co]]]): ...
+class BFSPredecessors(_RustworkxCustomVecIter[tuple[_T_co, list[_T_co]]], Generic[_T_co]): ...
 
 @final
-class EdgeIndexMap(Generic[_T_co], _RustworkxCustomHashMapIter[int, tuple[int, int, _T_co]]): ...
+class EdgeIndexMap(_RustworkxCustomHashMapIter[int, tuple[int, int, _T_co]], Generic[_T_co]): ...
 
 @final
 class EdgeIndices(_RustworkxCustomVecIter[int]): ...
@@ -1233,7 +1233,7 @@ class NodesCountMapping(_RustworkxCustomHashMapIter[int, int]): ...
 class Pos2DMapping(_RustworkxCustomHashMapIter[int, tuple[float, float]]): ...
 
 @final
-class WeightedEdgeList(Generic[_T_co], _RustworkxCustomVecIter[tuple[int, int, _T_co]]): ...
+class WeightedEdgeList(_RustworkxCustomVecIter[tuple[int, int, _T_co]], Generic[_T_co]): ...
 
 @final
 class CentralityMapping(_RustworkxCustomHashMapIter[int, float]): ...

rustworkx/visualization/graphviz.py

@@ -11,7 +11,8 @@
 import subprocess
 import tempfile
 import io
-from typing import TypeVar, Callable, cast, TYPE_CHECKING
+from typing import TypeVar, cast, TYPE_CHECKING
+from collections.abc import Callable
 
 from rustworkx import PyDiGraph, PyGraph
 

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 4.4.0
-envlist = py39, py310, py311, lint
+envlist = py310, py311, lint
 isolated_build = true
 
 [testenv]