Merge "Switch to 2023.1 Python3 unit tests and generic template name"

Fix tox error
Change-Id: Id9a8a9693af055ab14d9fcdcfda51d84c7d0d02a
2023-02-13 10:08:33 +00:00 · 2023-02-07 10:38:34 +00:00 · 2022-09-19 11:20:20 +00:00
3 changed files with 3 additions and 5 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,3 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-watcherclient.git
-defaultbranch=stable/zed
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,7 @@
 - project:
    templates:
      - openstack-cover-jobs
-      - openstack-python3-zed-jobs
+      - openstack-python3-jobs
      - publish-openstack-docs-pti
      - check-requirements
      - openstackclient-plugin-jobs
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 minversion = 3.18.0
 envlist = py3,pep8
-skipsdist = True

 [testenv]
 usedevelop = True
@@ -11,7 +10,7 @@ install_command = pip install {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
  -r{toxinidir}/test-requirements.txt
  -r{toxinidir}/requirements.txt
 allowlist_externals =
@@ -43,7 +42,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed}
+  -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