Merge pull request #19 from stackhpc/upstream/wallaby-2023-03-06

Synchronise wallaby with upstream

Author: markgoddard

tox.ini

@@ -24,9 +24,8 @@ setenv =
 # clue for oslo.db to use file-based database.
   OS_TEST_DBAPI_ADMIN_CONNECTION=sqlite:////tmp/placeholder-never-created-nor-used.db
 usedevelop = True
-install_command = pip install {opts} {packages}
-deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
-       -r{toxinidir}/test-requirements.txt
+install_command = python -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby} {opts} {packages}
+deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
 commands =
     find . -type f -name "*.pyc" -delete
@@ -91,7 +90,6 @@ commands =
 # This environment is called from CI scripts to test and publish
 # the API Ref to docs.openstack.org.
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
     -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf api-ref/build
@@ -143,7 +141,6 @@ paths = ./glance/hacking
 
 [testenv:docs]
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
     -r{toxinidir}/doc/requirements.txt
 commands =
   rm -fr doc/build
@@ -158,7 +155,6 @@ commands = {posargs}
 
 [testenv:releasenotes]
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
     -r{toxinidir}/doc/requirements.txt
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@@ -190,6 +186,7 @@ commands =
   oslo_debug_helper {posargs}
 
 [testenv:lower-constraints]
+install_command = python -m pip install {opts} {packages}
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt