Update TOX_CONSTRAINTS_FILE for stable/victoria

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

Change-Id: I6cfaedc6183cf3b29608cf90d2a1b175d4550cb2

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-cloudkittyclient.git
-defaultbranch=unmaintained/xena
+defaultbranch=stable/victoria

.zuul.yaml

@@ -46,10 +46,9 @@
       - openstack-lower-constraints-jobs
       - check-requirements
       - openstack-cover-jobs
-      - openstack-python3-xena-jobs
+      - openstack-python3-victoria-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
-      - release-notes-jobs-python3
     check:
       jobs:
         - cloudkittyclient-devstack-functional-v1-client:

CONTRIBUTING.rst

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

cloudkittyclient/tests/unit/v1/test_report_cli.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from collections import abc
+import collections
 from unittest import mock
 
 from cloudkittyclient.tests.unit.v1 import base
@@ -57,7 +57,7 @@ class TestReportCli(base.BaseAPIEndpointTestCase):
 
         assert len(result) == 2
         assert result[0] == ('Tenant ID', )
-        assert isinstance(result[1], abc.Iterable)
+        assert isinstance(result[1], collections.Iterable)
 
         for res in result[1]:
-            assert isinstance(res, abc.Iterable)
+            assert isinstance(res, collections.Iterable)

cloudkittyclient/v1/rating/hashmap.py

@@ -172,7 +172,7 @@ class HashmapManager(base.BaseManager):
         :param value: Value of the mapping
         :type value: str
         """
-        if kwargs.get('cost') is None:
+        if not kwargs.get('cost'):
             raise exc.ArgumentRequired("'cost' argument is required")
         if not kwargs.get('value'):
             if not kwargs.get('service_id'):
@@ -373,7 +373,7 @@ class HashmapManager(base.BaseManager):
         :type level: str
         """
         for arg in ['cost', 'level']:
-            if kwargs.get(arg) is None:
+            if not kwargs.get(arg):
                 raise exc.ArgumentRequired(
                     "'{}' argument is required".format(arg))
         if not kwargs.get('service_id') and not kwargs.get('field_id'):

doc/source/contributor.rst

@@ -0,0 +1,5 @@
+============
+Contributing
+============
+
+.. include:: ../../CONTRIBUTING.rst

doc/source/contributor/contributing.rst

@@ -1,47 +0,0 @@
-============================
-So You Want to Contribute...
-============================
-For general information on contributing to OpenStack, please check out the
-`contributor guide <https://docs.openstack.org/contributors/>`_ to get started.
-It covers all the basics that are common to all OpenStack projects: the accounts
-you need, the basics of interacting with our Gerrit review system, how we
-communicate as a community, etc.
-Below will cover the more project specific information you need to get started
-with python-cloudkittyclient.
-
-Communication
-~~~~~~~~~~~~~
-* IRC channel #cloudkitty at `OFTC <http://oftc.net>`_
-* Mailing list (prefix subjects with ``[cloudkitty]`` for faster responses)
-  http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
-
-Contacting the Core Team
-~~~~~~~~~~~~~~~~~~~~~~~~
-Please refer the `python-cloudkittyclient Core Team
-<https://review.opendev.org/admin/groups/4ac765c35f985b3ad9226da07fdcc205c1ce4fe1,members>`_ contacts.
-
-New Feature Planning
-~~~~~~~~~~~~~~~~~~~~
-Cloudkitty features are tracked on `Storyboard <https://storyboard.openstack.org/#!/project/895>`_.
-
-Task Tracking
-~~~~~~~~~~~~~
-We track our tasks in `Storyboard <https://storyboard.openstack.org/#!/project/895>`_.
-If you're looking for some smaller, easier work item to pick up and get started
-on, search for the 'low-hanging-fruit' tag.
-
-Reporting a Bug
-~~~~~~~~~~~~~~~
-You found an issue and want to make sure we are aware of it? You can do so on
-`StoryBoard <https://storyboard.openstack.org/#!/project/895>`_.
-
-Getting Your Patch Merged
-~~~~~~~~~~~~~~~~~~~~~~~~~
-All changes proposed to the python-cloudkittyclient project require one or two +2 votes
-from python-cloudkittyclient core reviewers before one of the core reviewers can approve
-patch by giving ``Workflow +1`` vote.
-
-Project Team Lead Duties
-~~~~~~~~~~~~~~~~~~~~~~~~
-All common PTL duties are enumerated in the `PTL guide
-<https://docs.openstack.org/project-team-guide/ptl.html>`_.

doc/source/index.rst

@@ -12,19 +12,10 @@ Contents:
 
    install
    usage
+   contributor
    cli_reference
    api_reference/index
 
-For Contributors
-================
-
-* If you are a new contributor to python-cloudkittyclient please refer: :doc:`contributor/contributing`
-
-  .. toctree::
-     :hidden:
-
-     contributor/contributing
-
 Indices and tables
 ==================
 

lower-constraints.txt

@@ -1,20 +1,21 @@
 # requirements
-pbr==5.5.1 # Apache-2.0
-cliff==3.5.0 # Apache-2.0
-keystoneauth1==4.3.0 # Apache-2.0
-oslo.utils==4.7.0 # Apache-2.0
-oslo.log==4.4.0 # Apache-2.0
-PyYAML==5.3.1 # MIT
-jsonpath-rw-ext==1.2.0 # Apache-2.0
-os-client-config==2.1.0 # Apache-2.0
-osc-lib==2.3.0 # Apache-2.0
+pbr==2.0.0 # Apache-2.0
+cliff==2.11.0 # Apache-2.0
+keystoneauth1==3.4.0 # Apache-2.0
+oslo.utils==3.35 # Apache-2.0
+oslo.log==3.36 # Apache-2.0
+PyYAML==3.12 # MIT
+jsonpath-rw-ext==1.0 # Apache-2.0
+os-client-config==1.29.0 # Apache-2.0
+osc-lib==1.12.1 # Apache-2.0
 
 # test-requirements.txt
 pyflakes==2.1.1
 coverage==4.0 # Apache-2.0
-python-subunit==1.4.0 # Apache-2.0/BSD
+python-subunit==0.0.18 # Apache-2.0/BSD
 oslotest==1.10.0 # Apache-2.0
 stestr==2.0 # Apache-2.0
+mock==2.0 # BSD
 python-openstackclient==3.14 # Apache-2.0
 
 # doc/requirements.txt

releasenotes/notes/fix-create_threshold-method-validation-f193e883e82214c9.yaml

@@ -1,8 +0,0 @@
----
-fixes:
-  - |
-    Fix `create_threshold` method when using cost as 0.
-    When using 0 as the cost, the `create_threshold` method
-    throws an exception. That happens because 0 (zero) is evaluated
-    to False. Therefore, we need to change the validation method to
-    check if the values are None.

releasenotes/notes/fix-zero-cost-mapping-7a4247cf1c6815f8.yaml

@@ -1,4 +0,0 @@
----
-fixes:
-  - |
-    Fixes creation of hashmap mappings with a zero cost.

releasenotes/source/index.rst

@@ -8,8 +8,6 @@ Contents
    :maxdepth: 2
 
    unreleased
-   wallaby
-   victoria
    ussuri
    train
    stein

releasenotes/source/victoria.rst

@@ -1,6 +0,0 @@
-=============================
-Victoria Series Release Notes
-=============================
-
-.. release-notes::
-   :branch: stable/victoria

releasenotes/source/wallaby.rst

@@ -1,6 +0,0 @@
-============================
-Wallaby Series Release Notes
-============================
-
-.. release-notes::
-   :branch: stable/wallaby

requirements.txt

@@ -2,12 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=5.5.1 # Apache-2.0
-cliff>=3.5.0 # Apache-2.0
-keystoneauth1>=4.3.0 # Apache-2.0
-oslo.utils>=4.7.0 # Apache-2.0
-oslo.log>=4.4.0 # Apache-2.0
-PyYAML>=5.3.1 # MIT
-jsonpath-rw-ext>=1.2.0 # Apache-2.0
-os-client-config>=2.1.0 # Apache-2.0
-osc-lib>=2.3.0 # Apache-2.0
+pbr>=2.0.0,!=2.1.0 # Apache-2.0
+cliff>=2.11.0 # Apache-2.0
+keystoneauth1>=3.4.0 # Apache-2.0
+oslo.utils>=3.35 # Apache-2.0
+oslo.log>=3.36 # Apache-2.0
+PyYAML>=3.12 # MIT
+jsonpath-rw-ext>=1.0 # Apache-2.0
+os-client-config>=1.29.0 # Apache-2.0
+osc-lib>=1.12.1 # Apache-2.0

setup.cfg

@@ -1,12 +1,12 @@
 [metadata]
 name = python-cloudkittyclient
 summary = API client of cloudkitty, Rating as a Service project.
-description_file =
+description-file =
     README.rst
 author = OpenStack
-author_email = openstack-discuss@lists.openstack.org
-home_page = https://docs.openstack.org/python-cloudkittyclient/latest/
-python_requires = >=3.6
+author-email = openstack-discuss@lists.openstack.org
+home-page = https://docs.openstack.org/python-cloudkittyclient/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology

test-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.
 
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 
 # remove this pyflakes from here once you bump the
 # hacking to 3.2.0 or above. hacking 3.2.0 takes
@@ -10,7 +10,7 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
 pyflakes>=2.1.1
 
 coverage>=4.0,!=4.4 # Apache-2.0
-python-subunit>=1.4.0 # Apache-2.0/BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
 stestr>=2.0 # Apache-2.0
 python-openstackclient>=3.14 # Apache-2.0

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-minversion = 3.18.0
-envlist = py3,pep8
+minversion = 3.1.1
+envlist = py36,py37,pep8
 skipsdist = True
 ignore_basepython_conflict = True
 
@@ -45,15 +45,13 @@ commands = flake8
 commands = {posargs}
 
 [testenv:docs]
-deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
-  -r{toxinidir}/doc/requirements.txt
+deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
-allowlist_externals =
+whitelist_externals =
   make
 commands =
   sphinx-build --keep-going -b latex doc/source doc/build/pdf
@@ -72,7 +70,7 @@ import_exceptions = cloudkittyclient.i18n
 
 [testenv:releasenotes]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
   -r{toxinidir}/doc/requirements.txt
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html