Reorganize imports

Author: qthibeault

banquo/__init__.py

@@ -1,10 +1,10 @@
 from typing import Final
 
+from ._banquo_impl import Bottom as _Bottom
+from ._banquo_impl import Top as _Top
 from .core import Formula, evaluate, formula
 from .expressions import Predicate
 from .trace import Trace
-from ._banquo_impl import Top as _Top
-from ._banquo_impl import Bottom as _Bottom
 
 Top: Final[_Top] = _Top()
 Bottom: Final[_Bottom] = _Bottom()

banquo/_banquo_impl.pyi

@@ -1,11 +1,11 @@
 from collections.abc import Callable, Iterable
-from typing import Any, Generic, TypeVar
 from types import ModuleType
+from typing import Any, Generic
 
-from typing_extensions import Self, override
+from typing_extensions import Self, TypeVar, override
 
 from .core import Formula
-from .operators import Bounds, M, M_neg, M_le, M_ge, M_neg_ge
+from .operators import Bounds, M, M_ge, M_le, M_neg, M_neg_ge
 
 class PanicException(Exception): ...
 
@@ -27,12 +27,12 @@ class Bottom(Any):  # pyright: ignore[reportAny, reportExplicitAny]
     def __ge__(self, other: object) -> bool: ...
     def __gt__(self, other: object) -> bool: ...
 
-class Trace(Generic[T]):
-    def __new__(cls, elements: dict[float, T] | Trace[T]) -> Self: ...
-    def __getitem__(self, value: float) -> T: ...
+class Trace(Generic[_T_co]):
+    def __new__(cls, elements: dict[float, _T_co] | Trace[_T_co]) -> Self: ...
+    def __getitem__(self, value: float) -> _T_co: ...
     def times(self) -> Iterable[float]: ...
-    def states(self) -> Iterable[T]: ...
-    def at_time(self, time: float) -> T | None: ...
+    def states(self) -> Iterable[_T_co]: ...
+    def at_time(self, time: float) -> _T_co | None: ...
 
 class Predicate(Formula[dict[str, float], float]):
     def __new__(cls, coefficients: dict[str, float], constant: float) -> Self: ...

banquo/core.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Protocol, TypeVar
+from typing import Protocol
 
-from typing_extensions import Self, override
+from typing_extensions import Self, TypeVar, override
 
 from ._banquo_impl import Trace as _Trace
 from .trace import Trace

banquo/expressions.py

@@ -3,8 +3,8 @@
 from collections.abc import Mapping
 
 from ._banquo_impl import Predicate as _Predicate
-from .operators import OperatorMixin
 from .core import EnsureOutput
+from .operators import OperatorMixin
 
 
 class Predicate(EnsureOutput[dict[str, float], float], OperatorMixin):

banquo/operators.py

@@ -1,23 +1,21 @@
 from __future__ import annotations
 
-import typing
+from typing_extensions import TypeAlias, TypeVar, override
 
-from typing_extensions import TypeAlias, override
-
-from ._banquo_impl import And as _And
 from ._banquo_impl import Always as _Always
+from ._banquo_impl import And as _And
 from ._banquo_impl import Eventually as _Eventually
 from ._banquo_impl import Implies as _Implies
 from ._banquo_impl import Next as _Next
 from ._banquo_impl import Not as _Not
 from ._banquo_impl import Or as _Or
 from .core import (
-    Formula,
     EnsureInput,
-    SupportsNeg,
-    SupportsLT,
-    SupportsGT,
     EnsureOutput,
+    Formula,
+    SupportsGT,
+    SupportsLT,
+    SupportsNeg,
     SupportsNegGE,
 )
 from .trace import Trace

banquo/stl.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from .core import EnsureOutput
 from ._banquo_impl import stl as _stl
+from .core import EnsureOutput
 
 
 class Formula(EnsureOutput[dict[str, float], float]):

banquo/trace.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 from collections.abc import Iterable, Iterator, Mapping
-from typing import TypeVar
 
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 from ._banquo_impl import Trace as _Trace
 

tests/test_operators.py

@@ -6,7 +6,7 @@
 import pytest
 import typing_extensions
 
-from banquo import Bottom, Trace, operators, formula
+from banquo import Bottom, Trace, formula, operators
 from banquo.core import Formula
 
 pytestmark = pytest.mark.unit