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
(cherry picked from commit fbec926c4744aa97a48a011939354c8b8f8be566)

diff --git a/tox.ini b/tox.ini
index 275cb35117490b54f4a152327b26d67561b7c68e..87105998e56e5cfeca9538ae7099c82a8a02254c 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -147,7 +147,8 @@ commands =
 basepython = python3
 deps=
       flake8
-      flake8-import-order
+      #flake8-import-order
+      git+https://github.com/sqlalchemyorg/flake8-import-order@fix_options
       flake8-builtins
       flake8-docstrings>=1.3.1
       flake8-rst-docstrings