From f0460fc4378408847b59ff1c4e634947b47a1eca Mon Sep 17 00:00:00 2001 From: zhangboye Date: Thu, 24 Dec 2020 13:49:41 +0800 Subject: [PATCH] Use TOX_CONSTRAINTS_FILE UPPER_CONSTRAINTS_FILE is old name and deprecated This allows to use upper-constraints file as more readable way instead of UPPER_CONSTRAINTS_FILE=. For more info. please refer [1]. [1] https://zuul-ci.org/docs/zuul-jobs/python-roles.html#rolevar-tox.tox_constraints_file Change-Id: I1600df016b90383c77e179e186d8c58fa9868d92 --- doc/source/contributor/topics/code-style.rst | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/contributor/topics/code-style.rst b/doc/source/contributor/topics/code-style.rst index b639c9f319..676083f09b 100644 --- a/doc/source/contributor/topics/code-style.rst +++ b/doc/source/contributor/topics/code-style.rst @@ -338,7 +338,7 @@ Having done a release of an xstatic package: "include-pypi-link: yes" setting. 2. Pull that patch down so you have the edited upper-constraints.txt file locally. -3. Set the environment variable `UPPER_CONSTRAINTS_FILE` to the edited +3. Set the environment variable `TOX_CONSTRAINTS_FILE` to the edited upper-constraints.txt file name and run tests or local development server through tox. This will pull in the precise version of the xstatic package that you need. diff --git a/tox.ini b/tox.ini index 0a88f7e974..e69b8312b3 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ whitelist_externals = bash find deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = @@ -123,7 +123,7 @@ commands = [testenv:docs] # We need to install horizon dependecies to build module references deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands =