Setting upper constraints to wallaby branch of requirements

The upper constraints of the python dependencies were previously
set to the master as well as to the wallaby branch.

As there is a growing possibility of conflict between them,
it is preferrable to keep only one, branch accurate, version
of the constraints.

Furthermore the installation directive of the tox environment
is unnecessary, as the the dependencies can be specified
separately and pulled during environment setup.

Closes-Bug: #1941897

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: I6a4b23824a1969668bbd02acab9db38c0f1291e9
This commit is contained in:
Jiri Podivin
2021-08-20 10:30:51 +02:00
parent 6795f6af67
commit e1c2fc7321

View File

@@ -11,7 +11,6 @@ ignore_basepython_conflict = True
[testenv]
basepython = python3
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} {opts} {packages}
passenv =
LANG
LANGUAGE
@@ -23,7 +22,7 @@ setenv =
LC_ALL={env:LC_ALL:en_US.UTF-8}
VIRTUAL_ENV={envdir}
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}
@@ -65,6 +64,7 @@ commands = oslo_debug_helper -t tripleoclient/tests {posargs}
[testenv:docs]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =
sphinx-build -a -E -W --keep-going -b html doc/source doc/build/html