Fix tox in other repos that import sysinv
sysinv.common.utils is imported in cgcs-patch. When keyring was added to that file, the tox and zuul jobs in cgcs-patch failed. The root reason for this is that when those other repos add sysinv as a dependency, only the requirements.txt is used when constructing the egg for import by tox. By properly relocating runtime required files from test-requirements.txt to requirements.txt, those other repos are able to import the additional required components. This does not impact rpms since those are driven by the Requires directives in the spec files. Change-Id: I8d9d84345a0810e311d2a50cdcbdb49056f80c2c Fixes-Bug: 1848786 Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
parent
58f05e8beb
commit
b2881d90df
|
@ -1 +1,2 @@
|
||||||
python-neutronclient
|
python-neutronclient
|
||||||
|
keyring
|
||||||
|
|
|
@ -18,4 +18,3 @@ testresources>=0.2.4 # Apache-2.0/BSD
|
||||||
tempest>=16.1.0 # Apache-2.0
|
tempest>=16.1.0 # Apache-2.0
|
||||||
httplib2
|
httplib2
|
||||||
python-keystoneclient
|
python-keystoneclient
|
||||||
keyring
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ boto3
|
||||||
cryptography!=2.0 # BSD/Apache-2.0
|
cryptography!=2.0 # BSD/Apache-2.0
|
||||||
eventlet==0.20.0
|
eventlet==0.20.0
|
||||||
greenlet>=0.3.2 # MIT
|
greenlet>=0.3.2 # MIT
|
||||||
|
keyring
|
||||||
kombu>=2.4.8
|
kombu>=2.4.8
|
||||||
lxml>=2.3
|
lxml>=2.3
|
||||||
WebOb>=1.7.1 # MIT
|
WebOb>=1.7.1 # MIT
|
||||||
|
|
|
@ -21,7 +21,6 @@ testtools!=1.2.0,>=0.9.36
|
||||||
tempest-lib<0.5.0,>=0.4.0
|
tempest-lib<0.5.0,>=0.4.0
|
||||||
ipaddr
|
ipaddr
|
||||||
pytest
|
pytest
|
||||||
keyring
|
|
||||||
pyudev
|
pyudev
|
||||||
libvirt-python>=1.2.5
|
libvirt-python>=1.2.5
|
||||||
migrate
|
migrate
|
||||||
|
|
Loading…
Reference in New Issue