Merge branch 'master' into stable/stein

.zuul.yaml

@@ -1,4 +1,5 @@
 - job:
+    # TODO(efried): Cut over to zuulv3
     name: novaclient-dsvm-functional
     parent: legacy-dsvm-base
     run: playbooks/legacy/novaclient-dsvm-functional/run.yaml
@@ -8,18 +9,18 @@
       - openstack/devstack-gate
       - openstack/nova
       - openstack/python-novaclient
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
 
 - project:
     templates:
       - check-requirements
-      - lib-forward-testing
       - lib-forward-testing-python3
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-victoria-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:

CONTRIBUTING.rst

@@ -1,16 +1,19 @@
-If you would like to contribute to the development of OpenStack,
-you must follow the steps documented at:
+The source repository for this project can be found at:
 
-   https://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://opendev.org/openstack/python-novaclient
 
-Once those steps have been completed, changes to OpenStack
-should be submitted for review via the Gerrit tool, following
-the workflow documented at:
+Pull requests submitted through GitHub are not monitored.
 
-   https://docs.openstack.org/infra/manual/developers.html#development-workflow
+To start contributing to OpenStack, follow the steps in the contribution guide
+to set up and use Gerrit:
 
-Pull requests submitted through GitHub will be ignored.
+   https://docs.openstack.org/contributors/code-and-documentation/quick-start.html
 
-Bugs should be filed on Launchpad, not GitHub:
+Bugs should be filed on Launchpad:
 
    https://bugs.launchpad.net/python-novaclient
+
+For more specific information about contributing to this repository, see the
+python-novaclient contributor guide:
+
+   https://docs.openstack.org/python-novaclient/latest/contributor/contributing.html

HACKING.rst

@@ -5,44 +5,26 @@ Nova Client Style Commandments
   https://docs.openstack.org/hacking/latest
 - Step 2: Read on
 
-
 Nova Client Specific Commandments
 ---------------------------------
 None so far
 
 Text encoding
 -------------
-- All text within python code should be of type 'unicode'.
-
-    WRONG:
-
-    >>> s = 'foo'
-    >>> s
-    'foo'
-    >>> type(s)
-    <type 'str'>
-
-    RIGHT:
-
-    >>> u = u'foo'
-    >>> u
-    u'foo'
-    >>> type(u)
-    <type 'unicode'>
 
 - Transitions between internal unicode and external strings should always
   be immediately and explicitly encoded or decoded.
 
 - All external text that is not explicitly encoded (database storage,
   commandline arguments, etc.) should be presumed to be encoded as utf-8.
 
-    WRONG:
+  Wrong::
 
     mystring = infile.readline()
     myreturnstring = do_some_magic_with(mystring)
     outfile.write(myreturnstring)
 
-    RIGHT:
+  Right::
 
     mystring = infile.readline()
     mytext = s.decode('utf-8')
@@ -52,8 +34,8 @@ Text encoding
 
 Running Tests
 -------------
-The testing system is based on a combination of tox and testr. If you just
-want to run the whole suite, run `tox` and all will be fine. However, if
+
+The testing system is based on a combination of tox and stestr. If you just
+want to run the whole suite, run ``tox`` and all will be fine. However, if
 you'd like to dig in a bit more, you might want to learn some things about
-testr itself. A basic walkthrough for OpenStack can be found at
-http://wiki.openstack.org/testr
+stestr itself.

README.rst

@@ -35,7 +35,7 @@ This is a client for the OpenStack Compute API. It provides a Python API (the
 .. _Launchpad project: https://launchpad.net/python-novaclient
 .. _Blueprints: https://blueprints.launchpad.net/python-novaclient
 .. _Bugs: https://bugs.launchpad.net/python-novaclient
-.. _Source: https://git.openstack.org/cgit/openstack/python-novaclient
+.. _Source: https://opendev.org/openstack/python-novaclient
 .. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html
 .. _Specs: http://specs.openstack.org/openstack/nova-specs/
 .. _Release Notes: https://docs.openstack.org/releasenotes/python-novaclient

doc/requirements.txt

@@ -1,9 +1,9 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0 # BSD
 
 # redirect tests in docs