Merge "Fix tox in other repos that import sysinv"

2019-10-25 13:05:47 +00:00
parent 9b3f78ac0d b2881d90df
commit 11fd3a617e
4 changed files with 2 additions and 2 deletions
--- a/sysinv/cgts-client/cgts-client/requirements.txt
+++ b/sysinv/cgts-client/cgts-client/requirements.txt
@@ -1 +1,2 @@
 python-neutronclient
+keyring
--- a/sysinv/cgts-client/cgts-client/test-requirements.txt
+++ b/sysinv/cgts-client/cgts-client/test-requirements.txt
@@ -18,4 +18,3 @@ testresources>=0.2.4 # Apache-2.0/BSD
 tempest>=16.1.0 # Apache-2.0
 httplib2
 python-keystoneclient
-keyring
--- a/sysinv/sysinv/sysinv/requirements.txt
+++ b/sysinv/sysinv/sysinv/requirements.txt
@@ -7,6 +7,7 @@ boto3
 cryptography!=2.0  # BSD/Apache-2.0
 eventlet==0.20.0
 greenlet>=0.3.2 # MIT
+keyring
 kombu>=2.4.8
 lxml>=2.3
 WebOb>=1.7.1  # MIT
--- a/sysinv/sysinv/sysinv/test-requirements.txt
+++ b/sysinv/sysinv/sysinv/test-requirements.txt
@@ -21,7 +21,6 @@ testtools!=1.2.0,>=0.9.36
 tempest-lib<0.5.0,>=0.4.0
 ipaddr
 pytest
-keyring
 pyudev
 libvirt-python>=1.2.5
 migrate