Browse Source

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>
tags/v3.0.0.rc0
Al Bailey 1 year ago
parent
commit
b2881d90df
4 changed files with 2 additions and 2 deletions
  1. +1
    -0
      sysinv/cgts-client/cgts-client/requirements.txt
  2. +0
    -1
      sysinv/cgts-client/cgts-client/test-requirements.txt
  3. +1
    -0
      sysinv/sysinv/sysinv/requirements.txt
  4. +0
    -1
      sysinv/sysinv/sysinv/test-requirements.txt

+ 1
- 0
sysinv/cgts-client/cgts-client/requirements.txt View File

@@ -1 +1,2 @@
python-neutronclient
keyring

+ 0
- 1
sysinv/cgts-client/cgts-client/test-requirements.txt View File

@@ -18,4 +18,3 @@ testresources>=0.2.4 # Apache-2.0/BSD
tempest>=16.1.0 # Apache-2.0
httplib2
python-keystoneclient
keyring

+ 1
- 0
sysinv/sysinv/sysinv/requirements.txt View File

@@ -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


+ 0
- 1
sysinv/sysinv/sysinv/test-requirements.txt View File

@@ -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


Loading…
Cancel
Save