double guard import issue

3.13 has an import issue, 3.14 has a "hey why are you ignoring here"
issue, solve them both

this then cascaded into zimport uncooperativeness so had to
fix that and put out 0.6.3, so this becomes more of a thing

Change-Id: I5c01e48af2af14be17c3e5f2a53e7913444b98eb
(cherry picked from commit f4c08c07d0ea4d18d384925f4c7d46f05566f42b)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 134d734484b5d1ea935083e4062375c2bcaa4ba4..8d730ca2d41fe27113b8bd1abbd0bad8be3812c7 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
     -   id: black
 
 -   repo: https://github.com/sqlalchemyorg/zimports
-    rev: v0.6.2
+    rev: v0.6.3
     hooks:
     -   id: zimports
 

diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index 5a4d6495e2c120aa79ff84d62e55a2bd7a9abdbf..d20427bf85b84817282d290c904ddfa38cb48d21 100644 (file)
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -64,7 +64,7 @@ if compat.py314:
     # vendor a minimal form of get_annotations per
     # https://github.com/python/cpython/issues/133684#issuecomment-2863841891
 
-    from annotationlib import call_annotate_function  # type: ignore
+    from annotationlib import call_annotate_function  # type: ignore[import-not-found,unused-ignore]  # noqa: E501
     from annotationlib import Format
 
     def _get_and_call_annotate(obj, format):  # noqa: A002

diff --git a/pyproject.toml b/pyproject.toml
index bc511e0250995f6ab5da15417617cea882fd66bf..cd04723ea28a080d1b0b0403cfa465abe21c9fa9 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -90,7 +90,7 @@ lint = [
     "pygments",
     "black==25.1.0",
     "slotscheck>=0.17.0",
-    "zimports",  # required by generate_tuple_map_overloads
+    "zimports>=0.6.3",  # required by generate_tuple_map_overloads
 ]
 
 mypy = [