Update TOX/UPPER_CONSTRAINTS_FILE for stable/ussuri

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/ussuri branch, tests will
continue to use the upper-constraints list on master.

Change-Id: I9fe8d91eca50c75107b7c181b98b9af0964cd36d

.gitreview

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

.zuul.yaml

@@ -1,7 +1,8 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python3-zed-jobs
+      - openstack-lower-constraints-jobs
+      - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - openstackclient-plugin-jobs

babel.cfg

@@ -0,0 +1,2 @@
+[python: **.py]
+

doc/requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=2.2.1 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=1.32.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 sphinxcontrib-apidoc>=0.2.0 # BSD
 

doc/source/conf.py

@@ -12,6 +12,8 @@
 # limitations under the License.
 
 
+from watcherclient import version as watcherclient_version
+
 # -- General configuration ----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
@@ -42,8 +44,18 @@ 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'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+# The full version, including alpha/beta/rc tags.
+release = watcherclient_version.version_info.release_string()
+# The short X.Y version.
+version = watcherclient_version.version_info.version_string()
 
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['watcherclient.']
@@ -56,7 +68,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'native'
+pygments_style = 'sphinx'
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -79,8 +91,8 @@ latex_documents = [
     (
         'index',
         '%s.tex' % project,
-        '%s Documentation' % project,
-        'OpenStack Foundation', 'manual'
+        u'%s Documentation' % project,
+        u'OpenStack Foundation', 'manual'
     ),
 ]
 
@@ -96,10 +108,9 @@ latex_elements = {
 }
 
 # openstackdocstheme options
-openstackdocs_repo_name = 'openstack/python-watcherclient'
-openstackdocs_pdf_link = True
-openstackdocs_bug_project = 'python-watcherclient'
-openstackdocs_bug_tag = ''
+repository_name = 'openstack/python-watcherclient'
+bug_project = 'python-watcherclient'
+bug_tag = ''
 
 
 #html_theme_options = {"show_other_versions": "True"}

lower-constraints.txt

@@ -1,13 +1,14 @@
 alabaster==0.7.10
 appdirs==1.4.3
 asn1crypto==0.23.0
+Babel==2.5.3
 certifi==2018.1.18
-cffi==1.14.0
+cffi==1.7.0
 chardet==3.0.4
 cliff==2.11.0
 cmd2==0.8.2
 coverage==4.0
-cryptography==2.7
+cryptography==2.1
 debtcollector==1.19.0
 decorator==4.2.1
 deprecation==2.0
@@ -18,6 +19,7 @@ extras==1.0.0
 fasteners==0.7.0
 fixtures==3.0.0
 flake8==2.5.5
+future==0.16.0
 hacking==0.12.0
 idna==2.6
 imagesize==0.7.1
@@ -31,11 +33,14 @@ keystoneauth1==3.4.0
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.2.1
+mock==2.0.0
 monotonic==1.4
+mox3==0.20.0
 msgpack-python==0.4.0
 munch==2.2.0
 netaddr==0.7.19
 netifaces==0.10.6
+openstackdocstheme==1.32.1
 openstacksdk==0.12.0
 os-client-config==1.29.0
 os-service-types==1.2.0
@@ -64,13 +69,15 @@ python-dateutil==2.5.3
 python-mimeparse==1.6.0
 python-subunit==1.0.0
 pytz==2018.3
-PyYAML==3.13
+PyYAML==3.12
 requests==2.18.4
 requestsexceptions==1.4.0
 rfc3986==0.3.1
 simplejson==3.13.2
 six==1.11.0
 snowballstemmer==1.2.1
+Sphinx==1.6.5
+sphinxcontrib-websupport==1.0.1
 stestr==2.0.0
 stevedore==1.28.0
 tempest==17.1.0

requirements.txt

@@ -2,6 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+Babel!=2.4.0,>=2.5.3 # BSD
 cliff!=2.9.0,>=2.11.0 # Apache-2.0
 osc-lib>=1.10.0 # Apache-2.0
 oslo.i18n>=3.20.0 # Apache-2.0
@@ -10,4 +11,4 @@ oslo.utils>=3.36.0 # Apache-2.0
 pbr!=2.1.0,>=3.1.1 # Apache-2.0
 keystoneauth1>=3.4.0 # Apache-2.0
 six>=1.11.0 # MIT
-PyYAML>=3.13 # MIT
+PyYAML>=3.12 # MIT

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,8 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
@@ -112,3 +112,17 @@ autodoc_index_modules = True
 autodoc_exclude_modules =
   watcherclient.tests.*
 api_doc_dir = reference/api
+
+[compile_catalog]
+directory = watcherclient/locale
+domain = watcherclient
+
+[update_catalog]
+domain = watcherclient
+output_dir = watcherclient/locale
+input_file = watcherclient/locale/watcherclient.pot
+
+[extract_messages]
+keywords = _ gettext ngettext l_ lazy_gettext  _LI _LW _LE _LC
+mapping_file = babel.cfg
+output_file = watcherclient/locale/watcherclient.pot

test-requirements.txt

@@ -4,7 +4,8 @@
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
+mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-minversion = 3.18.0
-envlist = py3,pep8
+minversion = 2.0
+envlist = py36,py37,pep8
 skipsdist = True
 
 [testenv]
@@ -11,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/master}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
   -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
@@ -43,7 +43,8 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+  -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
@@ -52,7 +53,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 =
@@ -78,3 +79,11 @@ commands = python setup.py bdist_wheel
 
 [hacking]
 import_exceptions = watcherclient._i18n
+
+[testenv:lower-constraints]
+basepython = python3
+install_command = pip install -U {opts} {packages}
+deps =
+  -c{toxinidir}/lower-constraints.txt
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt

watcherclient/common/utils.py

@@ -14,6 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from __future__ import print_function
+
 import argparse
 import os
 import uuid

watcherclient/tests/unit/common/test_api_versioning.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from unittest import mock
+import mock
 
 from watcherclient.common import api_versioning
 from watcherclient import exceptions

watcherclient/tests/unit/test_client.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from unittest import mock
+import mock
 
 from keystoneauth1 import loading as kaloading
 

watcherclient/tests/unit/test_utils.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from unittest import mock
+import mock
 
 from watcherclient.common.apiclient import exceptions as exc
 from watcherclient.common import utils

watcherclient/tests/unit/utils.py

@@ -15,9 +15,9 @@
 
 import copy
 import os
-from unittest import mock
 
 import fixtures
+import mock
 from oslo_utils import strutils
 import six
 import testtools

watcherclient/tests/unit/v1/base.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import shlex
-from unittest import mock
 
+import mock
 from osc_lib import utils as oscutils
 from oslo_serialization import jsonutils
 

watcherclient/tests/unit/v1/test_action_plan.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import copy
-from unittest import mock
+import mock
 
 import testtools
 from testtools import matchers

watcherclient/tests/unit/v1/test_action_plan_shell.py

@@ -14,11 +14,10 @@
 # limitations under the License.
 
 import datetime
-from unittest import mock
-
-from oslo_utils.uuidutils import generate_uuid
+import mock
 import six
 
+from oslo_utils.uuidutils import generate_uuid
 from watcherclient import exceptions
 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base

watcherclient/tests/unit/v1/test_action_shell.py

@@ -14,8 +14,7 @@
 #   under the License.
 
 import datetime
-from unittest import mock
-
+import mock
 import six
 
 from watcherclient import exceptions

watcherclient/tests/unit/v1/test_audit_shell.py

@@ -14,8 +14,7 @@
 #   under the License.
 
 import datetime
-from unittest import mock
-
+import mock
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_audit_template_shell.py

@@ -14,8 +14,7 @@
 #   under the License.
 
 import datetime
-from unittest import mock
-
+import mock
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_data_model_shell.py

@@ -12,9 +12,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-from unittest import mock
-
+import mock
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_goal_shell.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 
 import datetime
-from unittest import mock
-
+import mock
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_scoring_engine_shell.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 
 import datetime
-from unittest import mock
-
+import mock
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_service_shell.py

@@ -14,8 +14,7 @@
 # limitations under the License.
 
 import datetime
-from unittest import mock
-
+import mock
 import six
 
 from watcherclient import shell

watcherclient/tests/unit/v1/test_strategy_shell.py

@@ -14,10 +14,10 @@
 # limitations under the License.
 
 import datetime
-from unittest import mock
+import mock
+import six
 
 from oslo_serialization import jsonutils
-import six
 
 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base