From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 23 Nov 2022 22:44:30 +0000 (-0500)
Subject: flake8 has very courteously referred us to another pyqca project and closed all comme... 
X-Git-Tag: rel_1_4_45~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17313f90e12c30a17048790914f13f8b32c3e86d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

flake8 has very courteously referred us to another pyqca project and closed all comments, thank you!  I'll get on that right away

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 275cb35117..87105998e5 100644
--- 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