Update tox.ini for new upper constraints strategy

The requirements team has defined a new strategy for handling
upper constraints[1]. This patch applies those strategies to
Octavia dashboard.

[1] http://lists.openstack.org/pipermail/openstack-discuss/ \
    2019-May/006478.html

Change-Id: I9b0591734b8fa8125096748ff5dd739588b12172
This commit is contained in:
Michael Johnson 2019-06-28 15:56:44 -07:00
parent 648b60a4ce
commit da110314af
1 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ setenv =
NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_SHOW_ELAPSED=1
CLIENT_NAME=octavia-dashboard CLIENT_NAME=octavia-dashboard
DJANGO_SETTINGS_MODULE=octavia_dashboard.tests.settings DJANGO_SETTINGS_MODULE=octavia_dashboard.tests.settings
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
whitelist_externals = npm whitelist_externals = npm
@ -42,7 +42,7 @@ commands = npm install
basepython = python3 basepython = python3
whitelist_externals = rm whitelist_externals = rm
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
@ -54,7 +54,7 @@ commands =
basepython = python3 basepython = python3
whitelist_externals = rm whitelist_externals = rm
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =