commit 4e6c16037c1139e189d2ec7b6a90b43c3b10b16b
Author: Stephen Finucane <sfinucan@redhat.com>
Date:   Mon Oct 5 18:14:27 2020 +0100

    tox: Rename 'UPPER_CONSTRAINTS_FILE' -> 'TOX_CONSTRAINTS_FILE'
    
    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>

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