Merge "Update TOX_CONSTRAINTS_FILE for stable/wallaby" into stable/wallaby

Update the URL to the upper-constraints file to point to the redirect
rule on releases.openstack.org so that anyone working on this branch
will switch to the correct upper-constraints list automatically when
the requirements repository branches.

Until the requirements repository has as stable/wallaby branch, tests will
continue to use the upper-constraints list on master.

Change-Id: I7a8e4da45a26e7a3014a6de6611c88b01440bd77

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-watcherclient.git
-defaultbranch=unmaintained/2023.1
+defaultbranch=stable/wallaby

.zuul.yaml

@@ -1,7 +1,7 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python3-jobs
+      - openstack-python3-wallaby-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - openstackclient-plugin-jobs

doc/source/conf.py

@@ -42,8 +42,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'python-watcherclient'
-copyright = 'OpenStack Foundation'
+project = u'python-watcherclient'
+copyright = u'OpenStack Foundation'
 
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['watcherclient.']
@@ -79,8 +79,8 @@ latex_documents = [
     (
         'index',
         '%s.tex' % project,
-        '%s Documentation' % project,
-        'OpenStack Foundation', 'manual'
+        u'%s Documentation' % project,
+        u'OpenStack Foundation', 'manual'
     ),
 ]
 

setup.cfg

@@ -1,12 +1,12 @@
 [metadata]
 name = python-watcherclient
 summary = Python client library for Watcher API
-description_file =
+description-file =
     README.rst
 author = OpenStack
-author_email = openstack-discuss@lists.openstack.org
-home_page =  https://docs.openstack.org/python-watcherclient/latest/
-python_requires = >=3.8
+author-email = openstack-discuss@lists.openstack.org
+home-page =  https://docs.openstack.org/python-watcherclient/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -15,8 +15,9 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
 
 [files]
 packages =

tox.ini

@@ -1,6 +1,7 @@
 [tox]
-minversion = 3.18.0
-envlist = py3,pep8
+minversion = 2.0
+envlist = py36,py38,pep8
+skipsdist = True
 
 [testenv]
 usedevelop = True
@@ -10,10 +11,10 @@ install_command = pip install {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-allowlist_externals =
+whitelist_externals =
   rm
 commands = rm -f .testrepository/times.dbm
            # The --test-path is defined in .stestr.conf
@@ -42,7 +43,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
@@ -51,7 +52,7 @@ commands = sphinx-build -W -b html doc/source doc/build/html
 basepython = python3
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
-allowlist_externals =
+whitelist_externals =
   rm
   make
 commands =