diff -pruN 5.0.1-2/debian/changelog 5.1.1-2/debian/changelog --- 5.0.1-2/debian/changelog 2020-05-08 21:33:25.000000000 +0000 +++ 5.1.1-2/debian/changelog 2020-10-16 15:06:28.000000000 +0000 @@ -1,3 +1,18 @@ +python-qinlingclient (5.1.1-2) unstable; urgency=medium + + * Uploading to unstable. + * Fixed debian/watch. + * Add a debian/salsa-ci.yml. + + -- Thomas Goirand Fri, 16 Oct 2020 17:06:28 +0200 + +python-qinlingclient (5.1.1-1) experimental; urgency=medium + + * New upstream release. + * Removed python3-mock from build-depends. + + -- Thomas Goirand Wed, 09 Sep 2020 22:47:59 +0200 + python-qinlingclient (5.0.1-2) unstable; urgency=medium * Uploading to unstable. diff -pruN 5.0.1-2/debian/control 5.1.1-2/debian/control --- 5.0.1-2/debian/control 2020-05-08 21:33:25.000000000 +0000 +++ 5.1.1-2/debian/control 2020-10-16 15:06:28.000000000 +0000 @@ -19,7 +19,6 @@ Build-Depends-Indep: python3-hacking, python3-iso8601, python3-keystoneclient (>= 3.8.0), - python3-mock , python3-openstackclient (>= 3.12.0), python3-openstackdocstheme (>= 1.18.1) , python3-openstackdocstheme , diff -pruN 5.0.1-2/debian/salsa-ci.yml 5.1.1-2/debian/salsa-ci.yml --- 5.0.1-2/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ 5.1.1-2/debian/salsa-ci.yml 2020-10-16 15:06:28.000000000 +0000 @@ -0,0 +1,3 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 5.0.1-2/debian/watch 5.1.1-2/debian/watch --- 5.0.1-2/debian/watch 2020-05-08 21:33:25.000000000 +0000 +++ 5.1.1-2/debian/watch 2020-10-16 15:06:28.000000000 +0000 @@ -1,4 +1,3 @@ version=3 -opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ -https://pypi.debian.net/python-qinlingclient/python-qinlingclient-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) - +opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \ +https://github.com/openstack/python-qinlingclient/tags .*/(\d[brc\d\.]+)\.tar\.gz diff -pruN 5.0.1-2/doc/requirements.txt 5.1.1-2/doc/requirements.txt --- 5.0.1-2/doc/requirements.txt 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/doc/requirements.txt 2020-08-05 00:10:36.000000000 +0000 @@ -2,6 +2,6 @@ # 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,!=2.1.0,>=1.6.5 # BSD -openstackdocstheme>=1.24.0 # 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 diff -pruN 5.0.1-2/doc/source/conf.py 5.1.1-2/doc/source/conf.py --- 5.0.1-2/doc/source/conf.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/doc/source/conf.py 2020-08-05 00:10:36.000000000 +0000 @@ -77,7 +77,7 @@ latex_documents = [ #intersphinx_mapping = {'http://docs.python.org/': None} # openstackdocstheme options -repository_name = 'openstack/python-qinlingclient' -use_storyboard = True +openstackdocs_repo_name = 'openstack/python-qinlingclient' +openstackdocs_use_storyboard = True autoprogram_cliff_application = 'openstack' diff -pruN 5.0.1-2/lower-constraints.txt 5.1.1-2/lower-constraints.txt --- 5.0.1-2/lower-constraints.txt 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/lower-constraints.txt 2020-08-05 00:10:36.000000000 +0000 @@ -2,11 +2,11 @@ alabaster==0.7.10 appdirs==1.3.0 asn1crypto==0.23.0 Babel==2.3.4 -cffi==1.7.0 +cffi==1.14.0 cliff==2.8.0 cmd2==0.8.0 coverage==4.0 -cryptography==2.1 +cryptography==2.7 debtcollector==1.2.0 decorator==3.4.0 deprecation==1.0 @@ -27,7 +27,6 @@ jsonschema==2.6.0 keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 -mock==2.0.0 monotonic==0.6 mox3==0.20.0 msgpack-python==0.4.0 @@ -45,7 +44,6 @@ oslo.i18n==3.15.3 oslo.log==3.36.0 oslo.serialization==2.18.0 oslo.utils==3.33.0 -openstackdocstheme==1.18.1 oslotest==3.2.0 pbr==2.0.0 positional==1.2.1 @@ -65,8 +63,8 @@ python-novaclient==9.1.0 python-openstackclient==3.12.0 python-subunit==1.0.0 pytz==2013.6 -PyYAML==3.12 -reno==2.5.0 +PyYAML==3.13 +reno==3.1.0 requests==2.14.2 requests-mock==1.5.2 requestsexceptions==1.2.0 @@ -74,8 +72,6 @@ rfc3986==0.3.1 simplejson==3.5.1 six==1.10.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 -sphinxcontrib-websupport==1.0.1 stevedore==1.20.0 stestr==2.0.0 testscenarios==0.4 diff -pruN 5.0.1-2/qinlingclient/osc/v1/runtime.py 5.1.1-2/qinlingclient/osc/v1/runtime.py --- 5.0.1-2/qinlingclient/osc/v1/runtime.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/osc/v1/runtime.py 2020-08-05 00:10:36.000000000 +0000 @@ -47,6 +47,13 @@ class Create(command.ShowOne): help="Runtime description.", ) parser.add_argument( + "--private", + dest='is_public', + action='store_false', + help="Create private runtime or not, will create public" + "runtime if not specified", + ) + parser.add_argument( "--untrusted", dest='trusted', action='store_false', @@ -63,6 +70,7 @@ class Create(command.ShowOne): name=parsed_args.name, description=parsed_args.description, image=parsed_args.image, + is_public=parsed_args.is_public, trusted=parsed_args.trusted ) diff -pruN 5.0.1-2/qinlingclient/tests/unit/fakes.py 5.1.1-2/qinlingclient/tests/unit/fakes.py --- 5.0.1-2/qinlingclient/tests/unit/fakes.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/fakes.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six AUTH_TOKEN = 'foobar' diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/fakes.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/fakes.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/fakes.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/fakes.py 2020-08-05 00:10:36.000000000 +0000 @@ -14,7 +14,8 @@ import copy import hashlib -import mock +from unittest import mock + import six import uuid diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_alias.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_alias.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_alias.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_alias.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from osc_lib.tests import utils as osc_tests_utils diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_execution.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_execution.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_execution.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_execution.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from osc_lib.tests import utils as osc_tests_utils diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import zipfile from osc_lib.tests import utils as osc_tests_utils diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_version.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_version.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_version.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_version.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from osc_lib.tests import utils as osc_tests_utils diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_worker.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_worker.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_function_worker.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_function_worker.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from osc_lib.tests import utils as osc_tests_utils diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_job.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_job.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_job.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_job.py 2020-08-05 00:10:36.000000000 +0000 @@ -13,7 +13,7 @@ # limitations under the License. import datetime -import mock +from unittest import mock from osc_lib.tests import utils as osc_tests_utils diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_runtime.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_runtime.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_runtime.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_runtime.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from osc_lib.tests import utils as osc_tests_utils @@ -127,6 +127,7 @@ class TestCreateRuntime(TestRuntime): ('name', None), ('description', None), ('trusted', True), + ('is_public', True), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -137,6 +138,7 @@ class TestCreateRuntime(TestRuntime): 'description': None, 'image': image, 'trusted': True, + 'is_public': True, }) self.assertEqual(self.columns, columns) self.assertEqual(created_data, data) @@ -146,14 +148,17 @@ class TestCreateRuntime(TestRuntime): name = 'specified-runtime-name' description = 'specified-runtime-description' trusted = False + is_public = False attrs = {'image': image, 'name': name, - 'description': description, 'trusted': trusted} + 'description': description, 'trusted': trusted, + 'is_public': is_public} created_data = self._create_fake_runtime(attrs) arglist = [ '--name', name, '--description', description, '--untrusted', + '--private', image, ] verifylist = [ @@ -161,6 +166,7 @@ class TestCreateRuntime(TestRuntime): ('name', name), ('description', description), ('trusted', trusted), + ('is_public', is_public) ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -171,6 +177,7 @@ class TestCreateRuntime(TestRuntime): 'description': description, 'image': image, 'trusted': trusted, + 'is_public': is_public, }) self.assertEqual(self.columns, columns) self.assertEqual(created_data, data) diff -pruN 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_webhook.py 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_webhook.py --- 5.0.1-2/qinlingclient/tests/unit/osc/v1/test_webhook.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/osc/v1/test_webhook.py 2020-08-05 00:10:36.000000000 +0000 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from osc_lib.tests import utils as osc_tests_utils diff -pruN 5.0.1-2/qinlingclient/tests/unit/v1/test_runtime.py 5.1.1-2/qinlingclient/tests/unit/v1/test_runtime.py --- 5.0.1-2/qinlingclient/tests/unit/v1/test_runtime.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/tests/unit/v1/test_runtime.py 2020-08-05 00:10:36.000000000 +0000 @@ -50,7 +50,8 @@ class TestRuntime(test_client.TestQinlin def test_create_runtime(self): image_name = 'image_name' - request_data = {'image': image_name, 'trusted': True} + request_data = {'image': image_name, 'trusted': True, + 'is_public': True} self.requests_mock.register_uri( 'POST', @@ -70,9 +71,11 @@ class TestRuntime(test_client.TestQinlin runtime_name = 'runtime_name' description = 'A newly created runtime.' trusted = False + is_public = False request_data = {'image': image_name, 'trusted': trusted, - 'name': runtime_name, 'description': description} + 'name': runtime_name, 'is_public': is_public, + 'description': description} self.requests_mock.register_uri( 'POST', test_client.QINLING_URL + '/v1/runtimes', @@ -83,7 +86,7 @@ class TestRuntime(test_client.TestQinlin ret = self.client.runtimes.create( image_name, name=runtime_name, description=description, - trusted=False + trusted=False, is_public = False, ) self.assertEqual(RUNTIME_1, ret.to_dict()) diff -pruN 5.0.1-2/qinlingclient/v1/runtime.py 5.1.1-2/qinlingclient/v1/runtime.py --- 5.0.1-2/qinlingclient/v1/runtime.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/qinlingclient/v1/runtime.py 2020-08-05 00:10:36.000000000 +0000 @@ -25,8 +25,9 @@ class RuntimeManager(base.ManagerWithFin def list(self, **kwargs): return self._list("/v1/runtimes", response_key='runtimes') - def create(self, image, name=None, description=None, trusted=True): - data = {'image': image, 'trusted': trusted} + def create(self, image, name=None, description=None, + is_public=True, trusted=True): + data = {'image': image, 'is_public': is_public, 'trusted': trusted} if name: data.update({'name': name}) if description: diff -pruN 5.0.1-2/releasenotes/source/conf.py 5.1.1-2/releasenotes/source/conf.py --- 5.0.1-2/releasenotes/source/conf.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/releasenotes/source/conf.py 2020-08-05 00:10:36.000000000 +0000 @@ -272,3 +272,8 @@ texinfo_documents = [ # -- Options for Internationalization output ------------------------------ locale_dirs = ['locale/'] + +# openstackdocstheme options +openstackdocs_repo_name = 'openstack/python-qinlingclient' +openstackdocs_use_storyboard = True +openstackdocs_auto_name = False diff -pruN 5.0.1-2/releasenotes/source/index.rst 5.1.1-2/releasenotes/source/index.rst --- 5.0.1-2/releasenotes/source/index.rst 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/releasenotes/source/index.rst 2020-08-05 00:10:36.000000000 +0000 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + ussuri train stein rocky diff -pruN 5.0.1-2/releasenotes/source/ussuri.rst 5.1.1-2/releasenotes/source/ussuri.rst --- 5.0.1-2/releasenotes/source/ussuri.rst 1970-01-01 00:00:00.000000000 +0000 +++ 5.1.1-2/releasenotes/source/ussuri.rst 2020-08-05 00:10:36.000000000 +0000 @@ -0,0 +1,6 @@ +=========================== +Ussuri Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/ussuri diff -pruN 5.0.1-2/requirements.txt 5.1.1-2/requirements.txt --- 5.0.1-2/requirements.txt 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/requirements.txt 2020-08-05 00:10:36.000000000 +0000 @@ -9,7 +9,7 @@ iso8601>=0.1.11 # MIT six>=1.10.0 # MIT Babel!=2.4.0,>=2.3.4 # BSD requests>=2.14.2 # Apache-2.0 -PyYAML>=3.12 # MIT +PyYAML>=3.13 # MIT osc-lib>=1.8.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 diff -pruN 5.0.1-2/setup.cfg 5.1.1-2/setup.cfg --- 5.0.1-2/setup.cfg 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/setup.cfg 2020-08-05 00:10:36.000000000 +0000 @@ -21,6 +21,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] packages = diff -pruN 5.0.1-2/test-requirements.txt 5.1.1-2/test-requirements.txt --- 5.0.1-2/test-requirements.txt 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/test-requirements.txt 2020-08-05 00:10:36.000000000 +0000 @@ -1,11 +1,10 @@ # 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. -hacking>=3.0,<3.1.0 # Apache-2.0 +hacking>=3.0.1,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -mock>=2.0.0 # BSD requests-mock>=1.5.2 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD @@ -15,6 +14,4 @@ oslotest>=3.2.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0 # doc build requirements -openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD -reno>=2.5.0 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 diff -pruN 5.0.1-2/tools/install_venv_common.py 5.1.1-2/tools/install_venv_common.py --- 5.0.1-2/tools/install_venv_common.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/tools/install_venv_common.py 2020-08-05 00:10:36.000000000 +0000 @@ -19,8 +19,6 @@ virtual environments. Synced in from openstack-common """ -from __future__ import print_function - import argparse import os import subprocess diff -pruN 5.0.1-2/tools/install_venv.py 5.1.1-2/tools/install_venv.py --- 5.0.1-2/tools/install_venv.py 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/tools/install_venv.py 2020-08-05 00:10:36.000000000 +0000 @@ -21,8 +21,6 @@ Installation script for python-qinlingclient's development virtualenv """ -from __future__ import print_function - import os import sys diff -pruN 5.0.1-2/tox.ini 5.1.1-2/tox.ini --- 5.0.1-2/tox.ini 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/tox.ini 2020-08-05 00:10:36.000000000 +0000 @@ -1,5 +1,5 @@ [tox] -envlist = py37,pep8 +envlist = py38,pep8 minversion = 3.1.1 skipsdist = True ignore_basepython_conflict = True @@ -13,7 +13,7 @@ install_command = pip install {opts} {pa setenv = VIRTUAL_ENV={envdir} passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -51,13 +51,13 @@ commands = [testenv:pyflakes] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} flake8 commands = flake8 [testenv:releasenotes] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html diff -pruN 5.0.1-2/.zuul.yaml 5.1.1-2/.zuul.yaml --- 5.0.1-2/.zuul.yaml 2020-04-04 09:33:45.000000000 +0000 +++ 5.1.1-2/.zuul.yaml 2020-08-05 00:10:36.000000000 +0000 @@ -2,7 +2,7 @@ templates: - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-jobs - check-requirements - publish-openstack-docs-pti - release-notes-jobs-python3