flake8 has very courteously referred us to another pyqca project and closed all comme...

pyqca/flake8-import-order does not seem to have a release or a commit
in the past two years, so while I have created an issue and PR [1] [2],
for now vendor our fork so we can get on with things.

Also fix one issue for flake8 6.0

[1] https://github.com/PyCQA/flake8-import-order/issues/189
[2] https://github.com/PyCQA/flake8-import-order/pull/190

Change-Id: I53045f65b8716cceaf2104fccc1d26f80b398fef
References: https://github.com/PyCQA/flake8/issues/1751

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index f76fc447c01ead3cf76ee137d4be56b398c569c6..f1caf79be8335d39f3585d558d1c46e96bcebb96 100644 (file)
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -4997,7 +4997,7 @@ class Index(
         bind._run_ddl_visitor(ddl.SchemaDropper, self, checkfirst=checkfirst)
 
     def __repr__(self) -> str:
-        exprs: _typing_Sequence[Any]
+        exprs: _typing_Sequence[Any]  # noqa: F842
 
         return "Index(%s)" % (
             ", ".join(

diff --git a/tox.ini b/tox.ini
index bb92e65b22bc276f2d5cb83fe01c056d3d1bf08b..19e85756463ec9573b9beb7aa7277eee4aecd955 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -166,7 +166,8 @@ setenv=
 basepython = python3
 deps=
       flake8
-      flake8-import-order
+      #flake8-import-order
+      git+https://github.com/sqlalchemyorg/flake8-import-order@fix_options
       flake8-builtins
       flake8-future-annotations>=0.0.5
       flake8-docstrings>=1.6.0