openstack/os-vif
Code Issues Proposed changes

tox: Rename 'UPPER_CONSTRAINTS_FILE' -> 'TOX_CONSTRAINTS_FILE'

Browse Source 
This is the new name recommended by the base zuul jobs [1]:

  Path to a pip constraints file. Will be provided to tox via
  ``TOX_CONSTRAINTS_FILE`` (deprecated but currently still supported
  name is ``UPPER_CONSTRAINTS_FILE``) environment variable if it exists.

While we're here, we remove a wholly unnecessary layer of environment
variable-based indirection.

[1] https://opendev.org/zuul/zuul-jobs/raw/branch/master/roles/tox/README.rst

Change-Id: Ic82672f5376988ef6c40d2aaebf1a9e59d3538ad
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2020-10-05 18:14:27 +01:00
parent cc15462308
commit 4e6c16037c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tox.ini
View File

@ -8,9 +8,8 @@ ignore_basepython_conflict = True
basepython = python3 basepython = python3
usedevelop = True usedevelop = True
setenv = setenv =
CONSTRAINTS_OPT=-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
deps = deps =
{env:CONSTRAINTS_OPT} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = stestr run --black-regex ".tests.functional" {posargs} commands = stestr run --black-regex ".tests.functional" {posargs}
@ -24,7 +23,7 @@ commands =
[testenv:docs] [testenv:docs]
deps = deps =
{env:CONSTRAINTS_OPT} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html commands = sphinx-build -W -b html doc/source doc/build/html