tag: only import typing_extensions when TYPE_CHECKING

doc/upload-docs.sh

@@ -1,3 +1,3 @@
 #! /bin/sh
 
-rsync --verbose --archive --delete _build/html/* doc-upload:doc/pytools
+rsync --verbose --archive --delete _build/html/ doc-upload:doc/pytools

pyproject.toml

@@ -110,8 +110,11 @@ known-local-folder = [
 lines-after-imports = 2
 
 [tool.mypy]
+python_version = "3.8"
 ignore_missing_imports = true
 warn_unused_ignores = true
+# TODO: enable this at some point
+# check_untyped_defs = true
 
 [tool.typos.default]
 extend-ignore-re = [

pytools/__init__.py

@@ -32,6 +32,7 @@
 from functools import reduce, wraps
 from sys import intern
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     ClassVar,
@@ -52,15 +53,21 @@
 )
 
 
-try:
-    from typing import Concatenate, SupportsIndex
-except ImportError:
-    from typing_extensions import Concatenate, SupportsIndex
+if TYPE_CHECKING:
+    # NOTE: mypy seems to be confused by the `try.. except` below when called with
+    #   python -m mypy --python-version 3.8 ...
+    # see https://github.com/python/mypy/issues/14220
+    from typing_extensions import Concatenate, ParamSpec, SupportsIndex
+else:
+    try:
+        from typing import Concatenate, SupportsIndex
+    except ImportError:
+        from typing_extensions import Concatenate, SupportsIndex
 
-try:
-    from typing import ParamSpec
-except ImportError:
-    from typing_extensions import ParamSpec  # type: ignore[assignment]
+    try:
+        from typing import ParamSpec
+    except ImportError:
+        from typing_extensions import ParamSpec  # type: ignore[assignment]
 
 
 # These are deprecated and will go away in 2022.

pytools/convergence.py

@@ -75,7 +75,7 @@ def estimate_order_of_convergence(self,
             gliding_mean = size
 
         data_points = size - gliding_mean + 1
-        result = np.zeros((data_points, 2), float)
+        result: np.ndarray = np.zeros((data_points, 2), float)
         for i in range(data_points):
             result[i, 0], result[i, 1] = estimate_order_of_convergence(
                 abscissae[i:i+gliding_mean], errors[i:i+gliding_mean])

pytools/graph.py

@@ -66,6 +66,7 @@
 
 from dataclasses import dataclass
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     Collection,
@@ -83,10 +84,16 @@
 )
 
 
-try:
-    from typing import TypeAlias
-except ImportError:
+if TYPE_CHECKING:
+    # NOTE: mypy seems to be confused by the `try.. except` below when called with
+    #   python -m mypy --python-version 3.8 ...
+    # see https://github.com/python/mypy/issues/14220
     from typing_extensions import TypeAlias
+else:
+    try:
+        from typing import TypeAlias
+    except ImportError:
+        from typing_extensions import TypeAlias
 
 
 NodeT = TypeVar("NodeT", bound=Hashable)

pytools/persistent_dict.py

@@ -77,6 +77,10 @@
 
 logger = logging.getLogger(__name__)
 
+# NOTE: not always available so they get hardcoded here
+SQLITE_BUSY = getattr(sqlite3, "SQLITE_BUSY", 5)
+SQLITE_CONSTRAINT_PRIMARYKEY = getattr(sqlite3, "SQLITE_CONSTRAINT_PRIMARYKEY", 1555)
+
 __doc__ = """
 Persistent Hashing and Persistent Dictionaries
 ==============================================
@@ -574,7 +578,7 @@ def _exec_sql_fn(self, fn: Callable[[], T]) -> Optional[T]:
                 except sqlite3.OperationalError as e:
                     # If the database is busy, retry
                     if (hasattr(e, "sqlite_errorcode")
-                            and not e.sqlite_errorcode == sqlite3.SQLITE_BUSY):
+                        and e.sqlite_errorcode != SQLITE_BUSY):
                         raise
                     if n % 20 == 0:
                         warn(f"PersistentDict: database '{self.filename}' busy, {n} "
@@ -721,7 +725,7 @@ def store(self, key: K, value: V, _skip_if_present: bool = False) -> None:
                 self._exec_sql("INSERT INTO dict VALUES (?, ?)", (keyhash, v))
             except sqlite3.IntegrityError as e:
                 if hasattr(e, "sqlite_errorcode"):
-                    if e.sqlite_errorcode == sqlite3.SQLITE_CONSTRAINT_PRIMARYKEY:
+                    if e.sqlite_errorcode == SQLITE_CONSTRAINT_PRIMARYKEY:
                         raise ReadOnlyEntryError("WriteOncePersistentDict, "
                                                  "tried overwriting key") from e
                     else:

pytools/tag.py

@@ -40,10 +40,16 @@
 from warnings import warn
 
 
-try:
-    from typing import Self, dataclass_transform
-except ImportError:
+if TYPE_CHECKING:
+    # NOTE: mypy seems to be confused by the `try.. except` below when called with
+    #   python -m mypy --python-version 3.8 ...
+    # see https://github.com/python/mypy/issues/14220
     from typing_extensions import Self, dataclass_transform
+else:
+    try:
+        from typing import Self, dataclass_transform
+    except ImportError:
+        from typing_extensions import Self, dataclass_transform
 
 from pytools import memoize, memoize_method
 

pytools/test/test_pytools.py

@@ -497,7 +497,7 @@ def vectorized_add(self, ary):
 # }}}
 
 
-def test_tag():
+def test_tag() -> None:
     from pytools.tag import (
         NonUniqueTagError,
         Tag,
@@ -552,7 +552,7 @@ class BestInClassRibbon(FairRibbon, UniqueTag):
     # a subclass of Tag
     with pytest.raises(TypeError):
         check_tag_uniqueness(frozenset((
-            "I am not a tag", best_in_show_ribbon,
+            "I am not a tag", best_in_show_ribbon,  # type: ignore[arg-type]
             blue_ribbon, red_ribbon)))
 
     # Test that instantiation succeeds if there are multiple instances
@@ -583,7 +583,7 @@ class BestInClassRibbon(FairRibbon, UniqueTag):
 
     # Test that tagged() fails if tags are not a FrozenSet of Tags
     with pytest.raises(TypeError):
-        t1.tagged(tags=frozenset((1,)))
+        t1.tagged(tags=frozenset((1,)))  # type: ignore[arg-type]
 
     # Test without_tags() function
     t4 = t2.without_tags(red_ribbon)