openstack
/
whitebox-tempest-plugin
Code Issues Proposed changes

Remove tempest and oslo.log from requirements.txt 

We obviously still need tempest and oslo.log. By removing them from
requirements.txt, we enable environments where tempest (and oslo.log
as its dependency) have already been installed by other means, for
example in a CI environment where tempest is installed via RPM. By not
installing tempest and oslo.log with pip, we avoid all the potential
dependency conflicts between the distutils packages and their
dependencies, and what pip would pull in.

Tempest has to be added to test-requirements.txt to make sure our
non-devstack gate jobs pass, since they don't have devstack to install
tempest for them.

Change-Id: Ifbeb3bde160be50758a16c0aaa94ac95a6445d4a
This commit is contained in:
Artom Lifshitz 2020-07-29 15:31:16 -04:00
parent f5f21d6c7e
commit eb43bd91dd
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -5,9 +5,7 @@ setuptools>=17.1
# setuptools needs to be upgraded below to ensure we have
# a new enough setuptools version to support using >=
# for the python_version marker
tempest
#crudini>=0.9.3
oslo.log
sshtunnel<=0.1.3;python_version=='2.7' # MIT
sshtunnel;python_version>='3.6' # MIT
pymysql

9
test-requirements.txt
View File

@ -10,3 +10,12 @@ mock
oslotest
pycodestyle>=2.0.0,<2.6.0 # MIT
stestr<=2.6.0;python_version=='2.7' # MIT
# Tempest and oslo.log are actually runtime requirements (obviously), so they
# should be in requirements.txt. However, in order to support deployments where
# Tempest is installed from RPM and might conflict with a pip installation of
# whitebox and Tempest, it was removed from requirements.txt. This means that
# it had to be added here, to make sure it got installed for any tox jobs (like
# unit tests and pep8) that don't have something like devstack installing
# Tempest beforehand. oslo.log is in the same boat.
tempest
oslo.log