From 17d031ca8d4dd9990ae28302c6300b09b4c38ca3 Mon Sep 17 00:00:00 2001
From: Boden R <bodenvmw@gmail.com>
Date: Wed, 26 Jun 2019 14:56:18 -0600
Subject: [PATCH] update test-requirements.txt to only what's needed

This patch slims down the test-requirements.txt and
lower-constraints.txt so that we only require what we really use/need.
It also updates the flake8 section of tox.ini to match [1] except H904
is not included herein since vmware-nsx doesn't translate messages.

[1] https://review.opendev.org/#/c/667723/1/tox.ini

Change-Id: I4e0b1564640cf38b90e084abb410bd4de6d76733
---
 lower-constraints.txt | 7 -------
 test-requirements.txt | 8 --------
 tox.ini               | 5 +++++
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 296f601a87..616203aa96 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -19,7 +19,6 @@ oslo.db==4.37.0
 oslo.i18n==3.15.3
 oslo.log==3.36.0
 oslo.policy==1.30.0
-oslo.privsep==1.32.0
 oslo.serialization==2.28.1
 oslo.service==1.31.0
 oslo.utils==3.33.0
@@ -34,18 +33,12 @@ pylint==1.7.1
 python-openstackclient==3.16.0
 reno==2.5.0
 requests==2.14.2
-requests-mock==1.2.0
 six==1.11.0
 SQLAlchemy==1.2.0
 sphinx==1.6.5
 stestr==1.0.0
 stevedore==1.20.0
-tempest==17.1.0
 tenacity==4.9.0
-testrepository==0.0.18
-testresources==2.0.0
-testscenarios==0.4
 testtools==2.2.0
 tooz==1.58.0
 vmware-nsxlib==13.1.0
-WebTest==2.0.27
diff --git a/test-requirements.txt b/test-requirements.txt
index 16335eaa11..aa45eff896 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,14 +11,6 @@ mock>=2.0.0 # BSD
 psycopg2>=2.7 # LGPL/ZPL
 PyMySQL>=0.7.6 # MIT License
 oslotest>=3.2.0 # Apache-2.0
-oslo.privsep>=1.32.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
-testresources>=2.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-testscenarios>=0.4 # Apache-2.0/BSD
-WebTest>=2.0.27 # MIT
-tempest>=17.1.0 # Apache-2.0
 pylint==1.7.6 # GPLv2
-python-openstackclient>=3.16.0 # Apache-2.0
-requests-mock>=1.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 4b176d3331..00469cedf2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -150,6 +150,11 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/
 commands = sphinx-build -b html doc/source doc/build/html
 
 [flake8]
+# H106: Don't put vim configuration in source files
+# H203: Use assertIs(Not)None to check for None
+# H204: Use assert(Not)Equal to check for equality
+# H205: Use assert(Greater|Less)(Equal) for comparison
+enable-extensions=H106,H203,H204,H205
 # E125 continuation line does not distinguish itself from next logical line
 # E126 continuation line over-indented for hanging indent
 # E128 continuation line under-indented for visual indent