From b2881d90df736d7423bbecb237b1702891678bff Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Tue, 22 Oct 2019 11:39:22 -0500 Subject: [PATCH] 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 --- sysinv/cgts-client/cgts-client/requirements.txt | 1 + sysinv/cgts-client/cgts-client/test-requirements.txt | 1 - sysinv/sysinv/sysinv/requirements.txt | 1 + sysinv/sysinv/sysinv/test-requirements.txt | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysinv/cgts-client/cgts-client/requirements.txt b/sysinv/cgts-client/cgts-client/requirements.txt index 616bfb5b31..fae039f467 100644 --- a/sysinv/cgts-client/cgts-client/requirements.txt +++ b/sysinv/cgts-client/cgts-client/requirements.txt @@ -1 +1,2 @@ python-neutronclient +keyring diff --git a/sysinv/cgts-client/cgts-client/test-requirements.txt b/sysinv/cgts-client/cgts-client/test-requirements.txt index b3a26b9b16..665165e87f 100644 --- 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 diff --git a/sysinv/sysinv/sysinv/requirements.txt b/sysinv/sysinv/sysinv/requirements.txt index 38c415af9a..0047b5cb62 100644 --- 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 diff --git a/sysinv/sysinv/sysinv/test-requirements.txt b/sysinv/sysinv/sysinv/test-requirements.txt index f76d9c8f51..e8a051f647 100644 --- 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