Merge "Unpin pip-extra-reqs"
This commit is contained in:
commit
9f0634c23a
24
tox.ini
24
tox.ini
@ -212,33 +212,13 @@ commands =
|
||||
sh -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'
|
||||
|
||||
[testenv:pip-missing-reqs]
|
||||
# do not install test-requirements as that will pollute the virtualenv for
|
||||
# determining missing packages
|
||||
# this also means that pip-check-reqs must be installed separately, outside
|
||||
# of the requirements.txt files
|
||||
# pip-check-reqs 2.3.0 is broken with latest pip release (21.2.2), so cap it to
|
||||
# a previous release. But the latest pip-check-reqs working release doesn't
|
||||
# work with recent pip release, also cap pip to a release that is supported by
|
||||
# pip-check-reqs). Those caps will be removed once
|
||||
# https://github.com/r1chardj0n3s/pip-check-reqs/issues/66 is fixed.
|
||||
deps = pip-check-reqs<=2.2.2
|
||||
pip<=21.1.3
|
||||
deps = pip-check-reqs>=2.3.2
|
||||
-r{toxinidir}/requirements.txt
|
||||
commands =
|
||||
pip-missing-reqs --ignore-file=octavia/tests/* octavia
|
||||
|
||||
[testenv:pip-extra-reqs]
|
||||
# do not install test-requirements as that will pollute the virtualenv for
|
||||
# determining missing packages
|
||||
# this also means that pip-check-reqs must be installed separately, outside
|
||||
# of the requirements.txt files
|
||||
# pip-check-reqs 2.3.0 is broken with latest pip release (21.2.2), so cap it to
|
||||
# a previous release. But the latest pip-check-reqs working release doesn't
|
||||
# work with recent pip release, also cap pip to a release that is supported by
|
||||
# pip-check-reqs). Those caps will be removed once
|
||||
# https://github.com/r1chardj0n3s/pip-check-reqs/issues/66 is fixed.
|
||||
deps = pip-check-reqs<=2.2.2
|
||||
pip<=21.1.3
|
||||
deps = pip-check-reqs>=2.3.2
|
||||
-r{toxinidir}/requirements.txt
|
||||
commands =
|
||||
pip-extra-reqs --ignore-file=octavia/tests/* octavia
|
||||
|
@ -225,7 +225,8 @@
|
||||
required-projects:
|
||||
- openstack/octavia
|
||||
vars:
|
||||
tox_envlist: pip-missing-reqs,pip-extra-reqs
|
||||
# TODO (johnsom) Add pip-extra-reqs to this list when fixed
|
||||
tox_envlist: pip-missing-reqs
|
||||
|
||||
- job:
|
||||
name: octavia-v2-dsvm-scenario-fips
|
||||
|
Loading…
x
Reference in New Issue
Block a user