From 32fe945467e7c528555b15d2684c44581e70d83f Mon Sep 17 00:00:00 2001
From: Thomas Bachman <tbachman@yahoo.com>
Date: Wed, 16 Dec 2020 17:52:09 +0000
Subject: [PATCH] Fix upstream gate

Change-Id: I8ba570562ae0b69efc7ed5308dfb01ea7f986196
---
 test-requirements.txt | 4 ++--
 tox.ini               | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 0ee7695..dcd2b2c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,10 +5,10 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
 
 bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
-flake8-import-order==0.12 # LGPLv3
+flake8-import-order==0.18.1 # LGPLv3
 httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
 mock>=2.0.0 # BSD
-oslotest>=3.2.0,<=3.9.0 # Apache-2.0
+oslotest>=3.2.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
 sphinx!=1.6.6,>=1.6.2 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 038d14a..d9cf1d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,12 +47,13 @@ commands = bandit -r {toxinidir}/gbpclient -x {toxinidir}/gbpclient/tests -n5 -s
 # E125 continuation line does not distinguish itself from next logical line
 # F601 dictionary key name repeated with different values - REVISIT
 # H302 import only modules
+# I202 Additional newline in a group of imports
 # W503 line break before binary operator - REVISIT
 # W504 line break after binary operator - REVISIT
 # W605 invalid escape sequence - REVISIT
 #
 # REVISIT: Fix code and remove E129,E251,H305,H307,H405,H904 added for
 # hacking 0.9.2
-ignore = E125,H302,E129,E251,F601,H305,H307,H405,H904,W503,W504,W605
+ignore = E125,H302,E129,E251,F601,I202,H305,H307,H405,H904,W503,W504,W605
 show-source = true
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools