Fix CI tests
Adjust some of the dependencies. multi_key_dict is not shipped by OpenStack Zuul templates `build-openstack-docs-pti` or `openstack-cover-jobs` we thus need to depend on `requirements.txt`. setuptools v66.0.0 removed support for PEP 440 non-conforming versions. It provides pkg_resources which we use in PluginVersion. Tox `whitelist_externals` has been renamed `allowlist_externals`. Signed-off-by: Antoine Musso <hashar@free.fr> Change-Id: Ie791c2bb0e7b3784913f45768d2f3db4c66ccae5
This commit is contained in:
parent
d1e4696495
commit
70dc3e4f71
@ -4,7 +4,6 @@ build-essential [platform:dpkg]
|
|||||||
gcc [platform:rpm]
|
gcc [platform:rpm]
|
||||||
pypy [test]
|
pypy [test]
|
||||||
pypy-dev [test]
|
pypy-dev [test]
|
||||||
python-dev [platform:dpkg]
|
|
||||||
python-devel [platform:rpm]
|
python-devel [platform:rpm]
|
||||||
python3-dev [platform:dpkg]
|
python3-dev [platform:dpkg]
|
||||||
python3-devel [platform:fedora]
|
python3-devel [platform:fedora]
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
# Setuptools removed support for PEP 440 non-conforming versions
|
||||||
|
setuptools<66
|
||||||
six>=1.3.0
|
six>=1.3.0
|
||||||
pbr>=0.8.2
|
pbr>=0.8.2
|
||||||
multi_key_dict
|
multi_key_dict
|
||||||
|
@ -5,7 +5,8 @@ mock
|
|||||||
unittest2
|
unittest2
|
||||||
python-subunit
|
python-subunit
|
||||||
requests-mock>=1.4.0
|
requests-mock>=1.4.0
|
||||||
requests-kerberos
|
requests-kerberos<=0.12.0;python_version<'3.6'
|
||||||
|
requests-kerberos;python_version>='3.6'
|
||||||
sphinx>=1.6.0,<2.0.0;python_version=='2.7' # BSD
|
sphinx>=1.6.0,<2.0.0;python_version=='2.7' # BSD
|
||||||
sphinx>=1.6.0;python_version>='3.4' # BSD
|
sphinx>=1.6.0;python_version>='3.4' # BSD
|
||||||
stestr>=2.0.0,!=3.0.0
|
stestr>=2.0.0,!=3.0.0
|
||||||
|
5
tox.ini
5
tox.ini
@ -9,12 +9,13 @@ setenv =
|
|||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install {opts} {packages}
|
install_command = pip install {opts} {packages}
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
- find . -type f -name "*.pyc" -delete
|
- find . -type f -name "*.pyc" -delete
|
||||||
- find . -type d -name "__pycache__" -delete
|
- find . -type d -name "__pycache__" -delete
|
||||||
stestr run --slowest {posargs}
|
stestr run --slowest {posargs}
|
||||||
whitelist_externals =
|
allowlist_externals =
|
||||||
bash
|
bash
|
||||||
find
|
find
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user