OpenDev Migration Patch

This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.

.gitreview

@@ -1,4 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/python-karborclient.git
+defaultbranch=stable/rocky

.zuul.yaml

@@ -0,0 +1,16 @@
+- project:
+    templates:
+      - openstack-python-jobs
+      - openstack-python35-jobs
+      - check-requirements
+      - publish-openstack-sphinx-docs
+      - openstackclient-plugin-jobs
+    check:
+      jobs:
+        - openstack-tox-lower-constraints
+        - openstack-tox-cover:
+            voting: false
+
+    gate:
+      jobs:
+        - openstack-tox-lower-constraints

README.rst

@@ -2,8 +2,8 @@
 Team and repository tags
 ========================
 
-.. image:: https://governance.openstack.org/badges/python-karborclient.svg
-    :target: https://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/python-karborclient.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
 
 .. Change things from this point on
 
@@ -12,17 +12,17 @@ Karbor
 ======
 
 .. image:: https://img.shields.io/pypi/v/python-karborclient.svg
-    :target: https://pypi.python.org/pypi/python-karborclient/
+    :target: https://pypi.org/project/python-karborclient/
     :alt: Latest Version
 
 .. image:: https://img.shields.io/pypi/dm/python-karborclient.svg
-    :target: https://pypi.python.org/pypi/python-karborclient/
+    :target: https://pypi.org/project/python-karborclient/
     :alt: Downloads
 
 
 Karbor Mission Statement
 
-* Formalize Application Data Protection in OpenStack (APIs, Services, Plugins, …)
+* Formalize Application Data Protection in OpenStack (APIs, Services, Plugins, ...)
 * Be able to protect Any Resource in OpenStack(as well as their dependencies)
 * Allow Diversity of vendor solutions, capabilities and implementations
   without compromising usability
@@ -35,7 +35,8 @@ Karbor Mission Statement
 * `Specs`_
 * `How to Contribute`_
 
-.. _PyPi: https://pypi.python.org/pypi/python-karborclient
+.. _PyPi: https://pypi.org/project/python-karborclient
+
 .. _Launchpad project: https://launchpad.net/python-karborclient
 .. _Blueprints: https://blueprints.launchpad.net/python-karborclient
 .. _Bugs: https://bugs.launchpad.net/python-karborclient

doc/requirements.txt

@@ -0,0 +1,5 @@
+# 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

doc/source/contributor/index.rst

@@ -3,12 +3,12 @@ Contributing
 ============
 
 General Info
-============
+------------
 
 .. include:: ../../../CONTRIBUTING.rst
 
 Approved Specs
-==============
+--------------
 
 .. toctree::
    :maxdepth: 1

doc/source/index.rst

@@ -1,7 +1,8 @@
 Welcome to karborclient's documentation!
-========================================================
+========================================
 
-Contents:
+Contents
+--------
 
 .. toctree::
    :maxdepth: 1
@@ -12,9 +13,8 @@ Contents:
    contributor/index
 
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
-* :ref:`modindex`
 * :ref:`search`
 

doc/source/readme.rst

@@ -1,5 +1,5 @@
-############
+============
 Introduction
-############
+============
 
 .. include:: ../../README.rst

doc/source/user/index.rst

@@ -1,6 +1,6 @@
-========
+=====
 Usage
-========
+=====
 
 To use karborclient in a project::
 

lower-constraints.txt

@@ -0,0 +1,88 @@
+alabaster==0.7.10
+appdirs==1.3.0
+asn1crypto==0.23.0
+Babel==2.3.4
+cffi==1.7.0
+cliff==2.8.0
+cmd2==0.8.0
+coverage==4.0
+cryptography==2.1
+debtcollector==1.2.0
+decorator==3.4.0
+deprecation==1.0
+docutils==0.11
+dogpile.cache==0.6.2
+dulwich==0.15.0
+extras==1.0.0
+fixtures==3.0.0
+flake8==2.5.5
+hacking==0.12.0
+idna==2.6
+imagesize==0.7.1
+iso8601==0.1.11
+Jinja2==2.10
+jmespath==0.9.0
+jsonpatch==1.16
+jsonpointer==1.13
+jsonschema==2.6.0
+keystoneauth1==3.4.0
+linecache2==1.0.0
+MarkupSafe==1.0
+mccabe==0.2.1
+mock==2.0.0
+monotonic==0.6
+mox3==0.20.0
+msgpack-python==0.4.0
+munch==2.1.0
+netaddr==0.7.18
+netifaces==0.10.4
+openstackdocstheme==1.18.1
+openstacksdk==0.11.2
+os-client-config==1.28.0
+os-service-types==1.2.0
+osc-lib==1.8.0
+oslo.config==5.2.0
+oslo.context==2.19.2
+oslo.i18n==3.15.3
+oslo.log==3.36.0
+oslo.serialization==2.18.0
+oslo.utils==3.33.0
+oslotest==3.2.0
+pbr==2.0.0
+pep8==1.5.7
+positional==1.2.1
+prettytable==0.7.1
+pycparser==2.18
+pyflakes==0.8.1
+Pygments==2.2.0
+pyinotify==0.9.6
+pyOpenSSL==17.1.0
+pyparsing==2.1.0
+pyperclip==1.5.27
+python-cinderclient==3.3.0
+python-dateutil==2.5.3
+python-glanceclient==2.8.0
+python-keystoneclient==3.8.0
+python-mimeparse==1.6.0
+python-novaclient==9.1.0
+python-openstackclient==3.12.0
+python-subunit==1.0.0
+pytz==2013.6
+PyYAML==3.12
+requests-mock==1.2.0
+requests==2.14.2
+requestsexceptions==1.2.0
+rfc3986==0.3.1
+simplejson==3.5.1
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.6.2
+sphinxcontrib-websupport==1.0.1
+stevedore==1.20.0
+testrepository==0.0.18
+testscenarios==0.4
+testtools==2.2.0
+traceback2==1.4.0
+unittest2==1.1.0
+warlock==1.2.0
+wrapt==1.7.0

requirements.txt

@@ -3,12 +3,12 @@
 # process, which may cause wedges in the gate later.
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 PrettyTable<0.8,>=0.7.1 # BSD
-keystoneauth1>=3.2.0 # Apache-2.0
+keystoneauth1>=3.4.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 simplejson>=3.5.1 # MIT
 Babel!=2.4.0,>=2.3.4 # BSD
 six>=1.10.0 # MIT
-osc-lib>=1.7.0 # Apache-2.0
-oslo.utils>=3.31.0 # Apache-2.0
-oslo.log>=3.30.0 # Apache-2.0
+osc-lib>=1.8.0 # Apache-2.0
+oslo.utils>=3.33.0 # Apache-2.0
+oslo.log>=3.36.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0

setup.cfg

@@ -5,7 +5,7 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = https://docs.openstack.org/karbor/latest
+home-page = https://docs.openstack.org/python-karborclient/latest/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -89,14 +89,5 @@ keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = karborclient/locale/karborclient.pot
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [wheel]
 universal = 1

test-requirements.txt

@@ -7,11 +7,9 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
-sphinx>=1.6.2 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
+oslotest>=3.2.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
-requests-mock>=1.1.0 # Apache-2.0
+requests-mock>=1.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT

tools/tox_install.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE="$1"
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ "$CONSTRAINTS_FILE" != http* ]]; then
-    CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
-
-pip install -c"$localfile" openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints "$localfile" -- "$CLIENT_NAME"
-
-pip install -c"$localfile" -U "$@"
-exit $?

tox.ini

@@ -5,41 +5,52 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
-   BRANCH_NAME=master
-   CLIENT_NAME=python-karborclient
    PYTHONWARNINGS=default::DeprecationWarning
-deps = -r{toxinidir}/requirements.txt
+deps =
+       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky}
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+whitelist_externals = rm
+commands =
+  rm -f .testrepository/times.dbm
+  python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
+basepython = python3
 commands = flake8
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
-[testenv:functional]
-setenv =
-  {[testenv]setenv}
-  OS_TEST_PATH = ./karborclient/tests/functional
-passenv = OS_*
 [testenv:cover]
+basepython = python3
 commands =
   python setup.py test --coverage --testr-args='{posargs}'
   coverage report
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+basepython = python3
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:debug]
+basepython = python3
 commands = oslo_debug_helper -t karborclient/tests {posargs}
 
 [flake8]
 
 show-source = True
-ignore = 
+ignore =
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
+
+[testenv:lower-constraints]
+basepython = python3
+deps =
+  -c{toxinidir}/lower-constraints.txt
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt