From be09b73796b2aa22d0888d98eb29315f2f4786ab Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Thu, 17 Oct 2019 15:28:14 +0200 Subject: [PATCH] Make sure tox install requirements.txt with upper-constraints Ieb4ab13cf8ca5683fcd7b18ed669e8a26659bff1 removed the upper-constraints from the install_command which caused that only the test-requirements are installed with the upper-constraints enforced. This caused that when tox installed nova in the virtual env it installed the content of the requirement.txt without enforcing the upper-constraints. Today networkx 2.4 package has been released to pypi. The taskflow lib depends on networkx but does not pin the requirement but the openstack upper-constraints pins the networkx requirements properly. Nova depends on taskflow therefore when nova is installed by tox without the upper-constraints the new networkx 2.4 is installed. This broke the nova unit tests. This patch makes sure that all the requirements are installed with the upper-constraints enforced. Change-Id: Iba797243d2a137b551223165a1af1a8676bcea02 Closes-Bug: #1848499 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 4d781f5e47e1..44c84cd0f2e0 100644 --- a/tox.ini +++ b/tox.ini @@ -27,6 +27,7 @@ setenv = PYTHONWARNINGS = ignore::UserWarning:psycopg2 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt passenv = OS_DEBUG GENERATE_HASHES @@ -160,7 +161,7 @@ commands = description = Build main documentation. deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + {[testenv]deps} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/build/html doc/build/doctrees