Unpin pip-extra-reqs

The issue with compatibility between pip and pip-extra-reqs was already
fixed by [1].

Also, this patch disables the pip-extra-reqs part of the pip-check-reqs
job as it is reporting false positives.

[1] https://github.com/adamtheturtle/pip-check-reqs/issues/66

Change-Id: I92748b6e8a8ddeb2cfab280436a62a0109954de1
This commit is contained in:
Takashi Kajinami 2024-12-02 18:26:37 +09:00 committed by Michael Johnson
parent d1bb768220
commit f1af44a60f
2 changed files with 4 additions and 23 deletions

24
tox.ini
View File

@ -218,33 +218,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

View File

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