diff -Nru python-os-client-config-1.31.2/AUTHORS python-os-client-config-2.1.0/AUTHORS --- python-os-client-config-1.31.2/AUTHORS 2018-06-18 00:54:27.000000000 +0000 +++ python-os-client-config-2.1.0/AUTHORS 2020-04-02 18:38:17.000000000 +0000 @@ -9,16 +9,20 @@ Cao Xuan Hoang Cedric Brandily ChangBo Guo(gcb) +Charles Short Chris Church Christian Berendt Clark Boylan Clint Byrum Colleen Murphy +Corey Bryant +Dao Cong Tien David Shrewsbury Davide Guerri Dean Troyer Dean Troyer Dirk Mueller +Dmitry Tantsur Doug Hellmann Doug Wiegley Eric Harney @@ -48,6 +52,7 @@ Pavlo Shchelokovskyy Saju Sean Handley +Sean McGinnis Shuquan Huang Simon Leinen Spencer Krum @@ -57,12 +62,21 @@ Thomas Bechtold Tim Burke Tony Xu +Vieri <15050873171@163.com> Xav Paice +XiaojueGuan Yaguang Tang Yuriy Taraday -Zuul +ZhijunWei avnish +brandonzhao +jacky06 lifeless lingyongxu +malei +pengyuesheng +qingszhao ricolin xhzhf +zhouxinyong +zhulingjie diff -Nru python-os-client-config-1.31.2/ChangeLog python-os-client-config-2.1.0/ChangeLog --- python-os-client-config-1.31.2/ChangeLog 2018-06-18 00:54:27.000000000 +0000 +++ python-os-client-config-2.1.0/ChangeLog 2020-04-02 18:38:17.000000000 +0000 @@ -1,6 +1,53 @@ CHANGES ======= +2.1.0 +----- + +* Use unittest.mock instead of third party mock +* Uncap jsonschema + +2.0.0 +----- + +* Add a release note for Python 2 support removal +* Fix pep8 issue in o\_c\_c/\_\_init\_\_ +* Stop testing python2.7 +* Update the constraints url +* Update master for stable/train + +1.33.0 +------ + +* Fix broken link to openstacksdk +* Add Python 3 Train unit tests +* Update for opendev +* OpenDev Migration Patch +* Update master for stable/stein +* Update hacking version + +1.32.0 +------ + +* Applying the HTTPS protocal in configuration.rst +* Use template for lower-constraints +* Change openstack-dev to openstack-discuss +* Update min tox version to 2.0 +* Fix the conflict of urlparse between python2 and python3 +* Remove setup.py check from pep8 job +* Change python3.5 job to python3.7 job on Stein+ +* fix bug link in readme +* fix bug link in readme +* add lib-forward-testing-python3 test job +* add python 3.6 unit test job +* switch documentation job to new PTI +* import zuul job settings from project-config +* Update reno for stable/rocky +* Invalid link of doc reference +* Add release note link in README +* Shift Limestone Networks profile to openstacksdk +* Update links in README + 1.31.2 ------ diff -Nru python-os-client-config-1.31.2/debian/changelog python-os-client-config-2.1.0/debian/changelog --- python-os-client-config-1.31.2/debian/changelog 2019-07-11 09:12:26.000000000 +0000 +++ python-os-client-config-2.1.0/debian/changelog 2020-07-29 17:56:09.000000000 +0000 @@ -1,3 +1,21 @@ +python-os-client-config (2.1.0-0ubuntu3) groovy; urgency=medium + + [ Chris MacNaughton ] + * d/rules: Move to pybuild. + + -- Corey Bryant Wed, 29 Jul 2020 13:56:09 -0400 + +python-os-client-config (2.1.0-0ubuntu2) groovy; urgency=medium + + [ Chris MacNaughton ] + * New upstream release for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. + + [ Corey Bryant ] + * d/control: Drop remaining py2 Build-Depends. + + -- Corey Bryant Tue, 28 Jul 2020 13:28:45 -0400 + python-os-client-config (1.31.2-0ubuntu2) eoan; urgency=medium * d/control: Drop BDI's on python-* packages. diff -Nru python-os-client-config-1.31.2/debian/control python-os-client-config-2.1.0/debian/control --- python-os-client-config-1.31.2/debian/control 2019-07-11 09:12:26.000000000 +0000 +++ python-os-client-config-2.1.0/debian/control 2020-07-29 17:56:09.000000000 +0000 @@ -9,10 +9,6 @@ debhelper (>= 10~), dh-python, openstack-pkg-tools, - python-all, - python-pbr, - python-setuptools, - python-sphinx (>= 1.6.2), python3-all, python3-pbr, python3-setuptools, @@ -23,7 +19,7 @@ python3-extras (>= 1.0.0), python3-fixtures (>= 3.0.0), python3-glanceclient (>= 1:2.8.0), - python3-hacking (>= 0.12.0), + python3-hacking (>= 1.1.0), python3-jsonschema (>= 2.6.0), python3-keystoneauth1 (>= 3.3.0), python3-keystoneclient (>= 1:1.1.0), diff -Nru python-os-client-config-1.31.2/debian/rules python-os-client-config-2.1.0/debian/rules --- python-os-client-config-1.31.2/debian/rules 2019-07-11 09:12:26.000000000 +0000 +++ python-os-client-config-2.1.0/debian/rules 2020-07-29 17:56:09.000000000 +0000 @@ -1,10 +1,12 @@ #!/usr/bin/make -f +export PYBUILD_NAME=os_client_config + UPSTREAM_GIT := https://github.com/openstack/os-client-config.git include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python3,sphinxdoc + dh $@ --buildsystem=pybuild --with python3,sphinxdoc override_dh_auto_install: pkgos-dh_auto_install --no-py2 @@ -16,12 +18,12 @@ endif override_dh_clean: - dh_clean -O--buildsystem=python_distutils + dh_clean -O--buildsystem=pybuild rm -rf build override_dh_sphinxdoc: sphinx-build -b html doc/source debian/python-os-client-config-doc/usr/share/doc/python-os-client-config-doc/html - dh_sphinxdoc -O--buildsystem=python_distutils + dh_sphinxdoc -O--buildsystem=pybuild # Commands not to run override_dh_installcatalogs: diff -Nru python-os-client-config-1.31.2/doc/source/index.rst python-os-client-config-2.1.0/doc/source/index.rst --- python-os-client-config-1.31.2/doc/source/index.rst 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/doc/source/index.rst 2020-04-02 18:36:59.000000000 +0000 @@ -2,8 +2,8 @@ os-client-config ================ -.. image:: http://governance.openstack.org/badges/os-client-config.svg - :target: http://governance.openstack.org/reference/tags/index.html +.. image:: https://governance.openstack.org/tc/badges/os-client-config.svg + :target: https://governance.openstack.org/tc/reference/tags/index.html .. warning:: `os-client-config` has been superceded by `openstacksdk`_. While diff -Nru python-os-client-config-1.31.2/doc/source/user/releasenotes.rst python-os-client-config-2.1.0/doc/source/user/releasenotes.rst --- python-os-client-config-1.31.2/doc/source/user/releasenotes.rst 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/doc/source/user/releasenotes.rst 2020-04-02 18:36:59.000000000 +0000 @@ -3,4 +3,4 @@ ============= Release notes for `os-client-config` can be found at -http://docs.openstack.org/releasenotes/os-client-config/ +https://docs.openstack.org/releasenotes/os-client-config/ diff -Nru python-os-client-config-1.31.2/doc/source/user/using.rst python-os-client-config-2.1.0/doc/source/user/using.rst --- python-os-client-config-1.31.2/doc/source/user/using.rst 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/doc/source/user/using.rst 2020-04-02 18:36:59.000000000 +0000 @@ -92,13 +92,13 @@ It should be noted that OpenStack SDK has ways to construct itself that allow for additional flexibility. If the helper function here does not meet your needs, you should see the `from_config` method of -`openstack.connection.Connection `_ +`openstack.connection.Connection `_ Constructing shade objects -------------------------- If what you want to do is get a -`shade `_ OpenStackCloud object, a +`shade `_ OpenStackCloud object, a helper function that honors clouds.yaml and `OS_` environment variables is provided. The following will get you a fully configured `OpenStackCloud` instance. diff -Nru python-os-client-config-1.31.2/doc/source/user/vendor-support.rst python-os-client-config-2.1.0/doc/source/user/vendor-support.rst --- python-os-client-config-1.31.2/doc/source/user/vendor-support.rst 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/doc/source/user/vendor-support.rst 2020-04-02 18:36:59.000000000 +0000 @@ -3,4 +3,4 @@ ============== Please see -https://docs.openstack.org/openstacksdk/latest/user/vendor-support.html +https://docs.openstack.org/openstacksdk/latest/user/config/vendor-support.html diff -Nru python-os-client-config-1.31.2/lower-constraints.txt python-os-client-config-2.1.0/lower-constraints.txt --- python-os-client-config-1.31.2/lower-constraints.txt 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/lower-constraints.txt 2020-04-02 18:36:59.000000000 +0000 @@ -20,7 +20,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 mccabe==0.2.1 -mock==2.0.0 monotonic==0.6 mox3==0.20.0 netaddr==0.7.18 diff -Nru python-os-client-config-1.31.2/os_client_config/__init__.py python-os-client-config-2.1.0/os_client_config/__init__.py --- python-os-client-config-1.31.2/os_client_config/__init__.py 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/os_client_config/__init__.py 2020-04-02 18:36:59.000000000 +0000 @@ -65,6 +65,8 @@ app_name=app_name, app_version=app_version, **kwargs) return cloud.get_session_client(service_key, version=version) + + # Backwards compat - simple_client was a terrible name simple_client = make_rest_client # Backwards compat - session_client was a terrible name diff -Nru python-os-client-config-1.31.2/os_client_config/tests/test_cloud_config.py python-os-client-config-2.1.0/os_client_config/tests/test_cloud_config.py --- python-os-client-config-1.31.2/os_client_config/tests/test_cloud_config.py 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/os_client_config/tests/test_cloud_config.py 2020-04-02 18:36:59.000000000 +0000 @@ -11,10 +11,10 @@ # under the License. import copy +from unittest import mock from keystoneauth1 import exceptions as ksa_exceptions from keystoneauth1 import session as ksa_session -import mock from openstack.config import cloud_region diff -Nru python-os-client-config-1.31.2/os_client_config/vendors/limestonenetworks.json python-os-client-config-2.1.0/os_client_config/vendors/limestonenetworks.json --- python-os-client-config-1.31.2/os_client_config/vendors/limestonenetworks.json 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/os_client_config/vendors/limestonenetworks.json 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -{ - "name": "limestonenetworks", - "profile": { - "auth": { - "auth_url": "https://auth.cloud.lstn.net:5000/v3" - }, - "regions": [ - "us-dfw-1", - "us-slc" - ], - "identity_api_version": "3", - "image_format": "raw", - "volume_api_version": "3" - } - } diff -Nru python-os-client-config-1.31.2/os_client_config.egg-info/pbr.json python-os-client-config-2.1.0/os_client_config.egg-info/pbr.json --- python-os-client-config-1.31.2/os_client_config.egg-info/pbr.json 2018-06-18 00:54:27.000000000 +0000 +++ python-os-client-config-2.1.0/os_client_config.egg-info/pbr.json 2020-04-02 18:38:17.000000000 +0000 @@ -1 +1 @@ -{"git_version": "a024da3", "is_release": true} \ No newline at end of file +{"git_version": "bc96c23", "is_release": true} \ No newline at end of file diff -Nru python-os-client-config-1.31.2/os_client_config.egg-info/PKG-INFO python-os-client-config-2.1.0/os_client_config.egg-info/PKG-INFO --- python-os-client-config-1.31.2/os_client_config.egg-info/PKG-INFO 2018-06-18 00:54:27.000000000 +0000 +++ python-os-client-config-2.1.0/os_client_config.egg-info/PKG-INFO 2020-04-02 18:38:17.000000000 +0000 @@ -1,17 +1,17 @@ Metadata-Version: 1.1 Name: os-client-config -Version: 1.31.2 +Version: 2.1.0 Summary: OpenStack Client Configuation Library Home-page: https://docs.openstack.org/os-client-config/latest Author: OpenStack -Author-email: openstack-dev@lists.openstack.org +Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN Description: ================ os-client-config ================ - .. image:: http://governance.openstack.org/badges/os-client-config.svg - :target: http://governance.openstack.org/reference/tags/index.html + .. image:: https://governance.openstack.org/tc/badges/os-client-config.svg + :target: https://governance.openstack.org/tc/reference/tags/index.html .. warning:: `os-client-config` has been superceded by `openstacksdk`_. While @@ -34,8 +34,9 @@ * Free software: Apache license * Documentation: http://docs.openstack.org/os-client-config/latest - * Source: http://git.openstack.org/cgit/openstack/os-client-config - * Bugs: http://bugs.launchpad.net/os-client-config + * Source: http://opendev.org/openstack/os-client-config + * Bugs: https://storyboard.openstack.org/#!/project/openstack/os-client-config + * Release Notes https://docs.openstack.org/releasenotes/os-client-config .. _openstacksdk: http://docs.openstack.org/openstacksdk/latest @@ -47,7 +48,6 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -Nru python-os-client-config-1.31.2/os_client_config.egg-info/SOURCES.txt python-os-client-config-2.1.0/os_client_config.egg-info/SOURCES.txt --- python-os-client-config-1.31.2/os_client_config.egg-info/SOURCES.txt 2018-06-18 00:54:27.000000000 +0000 +++ python-os-client-config-2.1.0/os_client_config.egg-info/SOURCES.txt 2020-04-02 18:38:17.000000000 +0000 @@ -49,12 +49,12 @@ os_client_config/tests/test_import_vendors.py os_client_config/tests/test_init.py os_client_config/vendors/__init__.py -os_client_config/vendors/limestonenetworks.json releasenotes/notes/catch-up-release-notes-e385fad34e9f3d6e.yaml releasenotes/notes/cloud-profile-status-e0d29b5e2f10e95c.yaml releasenotes/notes/default-cloud-7ee0bcb9e5dd24b9.yaml releasenotes/notes/fix-compat-with-old-keystoneauth-66e11ee9d008b962.yaml releasenotes/notes/fix-vendor-import-ebd4ade0d5c17146.yaml +releasenotes/notes/goodbye-python2-40feeeb4be3e06c5.yaml releasenotes/notes/ironic-microversion-ba5b0f36f11196a6.yaml releasenotes/notes/load-yaml-3177efca78e5c67a.yaml releasenotes/notes/magic-fixes-dca4ae4dac2441a8.yaml @@ -79,6 +79,9 @@ releasenotes/source/ocata.rst releasenotes/source/pike.rst releasenotes/source/queens.rst +releasenotes/source/rocky.rst +releasenotes/source/stein.rst +releasenotes/source/train.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -Nru python-os-client-config-1.31.2/PKG-INFO python-os-client-config-2.1.0/PKG-INFO --- python-os-client-config-1.31.2/PKG-INFO 2018-06-18 00:54:27.000000000 +0000 +++ python-os-client-config-2.1.0/PKG-INFO 2020-04-02 18:38:17.000000000 +0000 @@ -1,17 +1,17 @@ Metadata-Version: 1.1 Name: os-client-config -Version: 1.31.2 +Version: 2.1.0 Summary: OpenStack Client Configuation Library Home-page: https://docs.openstack.org/os-client-config/latest Author: OpenStack -Author-email: openstack-dev@lists.openstack.org +Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN Description: ================ os-client-config ================ - .. image:: http://governance.openstack.org/badges/os-client-config.svg - :target: http://governance.openstack.org/reference/tags/index.html + .. image:: https://governance.openstack.org/tc/badges/os-client-config.svg + :target: https://governance.openstack.org/tc/reference/tags/index.html .. warning:: `os-client-config` has been superceded by `openstacksdk`_. While @@ -34,8 +34,9 @@ * Free software: Apache license * Documentation: http://docs.openstack.org/os-client-config/latest - * Source: http://git.openstack.org/cgit/openstack/os-client-config - * Bugs: http://bugs.launchpad.net/os-client-config + * Source: http://opendev.org/openstack/os-client-config + * Bugs: https://storyboard.openstack.org/#!/project/openstack/os-client-config + * Release Notes https://docs.openstack.org/releasenotes/os-client-config .. _openstacksdk: http://docs.openstack.org/openstacksdk/latest @@ -47,7 +48,6 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -Nru python-os-client-config-1.31.2/README.rst python-os-client-config-2.1.0/README.rst --- python-os-client-config-1.31.2/README.rst 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/README.rst 2020-04-02 18:36:59.000000000 +0000 @@ -2,8 +2,8 @@ os-client-config ================ -.. image:: http://governance.openstack.org/badges/os-client-config.svg - :target: http://governance.openstack.org/reference/tags/index.html +.. image:: https://governance.openstack.org/tc/badges/os-client-config.svg + :target: https://governance.openstack.org/tc/reference/tags/index.html .. warning:: `os-client-config` has been superceded by `openstacksdk`_. While @@ -26,7 +26,8 @@ * Free software: Apache license * Documentation: http://docs.openstack.org/os-client-config/latest -* Source: http://git.openstack.org/cgit/openstack/os-client-config -* Bugs: http://bugs.launchpad.net/os-client-config +* Source: http://opendev.org/openstack/os-client-config +* Bugs: https://storyboard.openstack.org/#!/project/openstack/os-client-config +* Release Notes https://docs.openstack.org/releasenotes/os-client-config .. _openstacksdk: http://docs.openstack.org/openstacksdk/latest diff -Nru python-os-client-config-1.31.2/releasenotes/notes/goodbye-python2-40feeeb4be3e06c5.yaml python-os-client-config-2.1.0/releasenotes/notes/goodbye-python2-40feeeb4be3e06c5.yaml --- python-os-client-config-1.31.2/releasenotes/notes/goodbye-python2-40feeeb4be3e06c5.yaml 1970-01-01 00:00:00.000000000 +0000 +++ python-os-client-config-2.1.0/releasenotes/notes/goodbye-python2-40feeeb4be3e06c5.yaml 2020-04-02 18:36:59.000000000 +0000 @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. The minimum version of Python now + supported by os-client-config is Python 3.6. diff -Nru python-os-client-config-1.31.2/releasenotes/source/index.rst python-os-client-config-2.1.0/releasenotes/source/index.rst --- python-os-client-config-1.31.2/releasenotes/source/index.rst 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/releasenotes/source/index.rst 2020-04-02 18:36:59.000000000 +0000 @@ -9,6 +9,9 @@ :maxdepth: 2 unreleased + train + stein + rocky queens pike ocata diff -Nru python-os-client-config-1.31.2/releasenotes/source/rocky.rst python-os-client-config-2.1.0/releasenotes/source/rocky.rst --- python-os-client-config-1.31.2/releasenotes/source/rocky.rst 1970-01-01 00:00:00.000000000 +0000 +++ python-os-client-config-2.1.0/releasenotes/source/rocky.rst 2020-04-02 18:36:59.000000000 +0000 @@ -0,0 +1,6 @@ +=================================== + Rocky Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/rocky diff -Nru python-os-client-config-1.31.2/releasenotes/source/stein.rst python-os-client-config-2.1.0/releasenotes/source/stein.rst --- python-os-client-config-1.31.2/releasenotes/source/stein.rst 1970-01-01 00:00:00.000000000 +0000 +++ python-os-client-config-2.1.0/releasenotes/source/stein.rst 2020-04-02 18:36:59.000000000 +0000 @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff -Nru python-os-client-config-1.31.2/releasenotes/source/train.rst python-os-client-config-2.1.0/releasenotes/source/train.rst --- python-os-client-config-1.31.2/releasenotes/source/train.rst 1970-01-01 00:00:00.000000000 +0000 +++ python-os-client-config-2.1.0/releasenotes/source/train.rst 2020-04-02 18:36:59.000000000 +0000 @@ -0,0 +1,6 @@ +========================== +Train Series Release Notes +========================== + +.. release-notes:: + :branch: stable/train diff -Nru python-os-client-config-1.31.2/setup.cfg python-os-client-config-2.1.0/setup.cfg --- python-os-client-config-1.31.2/setup.cfg 2018-06-18 00:54:27.000000000 +0000 +++ python-os-client-config-2.1.0/setup.cfg 2020-04-02 18:38:17.000000000 +0000 @@ -4,7 +4,7 @@ description-file = README.rst author = OpenStack -author-email = openstack-dev@lists.openstack.org +author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/os-client-config/latest classifier = Environment :: OpenStack @@ -13,10 +13,9 @@ License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = @@ -31,9 +30,6 @@ [upload_sphinx] upload-dir = doc/build/html -[wheel] -universal = 1 - [egg_info] tag_build = tag_date = 0 diff -Nru python-os-client-config-1.31.2/test-requirements.txt python-os-client-config-2.1.0/test-requirements.txt --- python-os-client-config-1.31.2/test-requirements.txt 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/test-requirements.txt 2020-04-02 18:36:59.000000000 +0000 @@ -2,13 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=1.1.0,<1.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 extras>=1.0.0 # MIT fixtures>=3.0.0 # Apache-2.0/BSD -jsonschema<3.0.0,>=2.6.0 # MIT -mock>=2.0.0 # BSD +jsonschema>=2.6.0 # MIT python-glanceclient>=2.8.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 diff -Nru python-os-client-config-1.31.2/tools/keystone_version.py python-os-client-config-2.1.0/tools/keystone_version.py --- python-os-client-config-1.31.2/tools/keystone_version.py 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/tools/keystone_version.py 2020-04-02 18:36:59.000000000 +0000 @@ -16,7 +16,7 @@ import os_client_config import pprint import sys -import urlparse +import six.moves.urllib.parse as urlparse def print_versions(r): diff -Nru python-os-client-config-1.31.2/tox.ini python-os-client-config-2.1.0/tox.ini --- python-os-client-config-1.31.2/tox.ini 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/tox.ini 2020-04-02 18:36:59.000000000 +0000 @@ -1,12 +1,13 @@ [tox] -minversion = 1.6 -envlist = py35,py27,pep8 +minversion = 2.0 +envlist = py37,pep8 skipsdist = True [testenv] usedevelop = True passenv = UPPER_CONSTRAINTS_FILE install_command = pip install -U {opts} {packages} +basepython = python3 setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 @@ -16,33 +17,29 @@ OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 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}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} stestr slowest [testenv:pep8] -basepython = python3 usedevelop = False skip_install = True 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} doc8 hacking pygments readme commands = doc8 doc/source - python setup.py check -r -s flake8 os_client_config [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 setenv = {[testenv]setenv} PYTHON=coverage run --source os_client_config --parallel-mode @@ -53,20 +50,18 @@ coverage xml -o cover/coverage.xml [testenv:docs] -basepython = python3 skip_install = True 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}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html [testenv:releasenotes] -basepython = python3 skip_install = True 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 @@ -77,7 +72,6 @@ [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt diff -Nru python-os-client-config-1.31.2/.zuul.yaml python-os-client-config-2.1.0/.zuul.yaml --- python-os-client-config-1.31.2/.zuul.yaml 2018-06-18 00:51:04.000000000 +0000 +++ python-os-client-config-2.1.0/.zuul.yaml 2020-04-02 18:36:59.000000000 +0000 @@ -1,24 +1,11 @@ - job: - name: os-client-config-tox-py27-tips - parent: openstack-tox-py27 + name: os-client-config-tox-py37-tips + parent: openstack-tox-py37 description: | - Run tox python 27 unittests against master of important libs + Run tox python 37 unittests against master of important libs vars: tox_install_siblings: true - zuul_work_dir: src/git.openstack.org/openstack/os-client-config - required-projects: - - openstack/keystoneauth - - openstack/openstacksdk - - openstack/os-client-config - -- job: - name: os-client-config-tox-py35-tips - parent: openstack-tox-py35 - description: | - Run tox python 35 unittests against master of important libs - vars: - tox_install_siblings: true - zuul_work_dir: src/git.openstack.org/openstack/os-client-config + zuul_work_dir: src/opendev.org/openstack/os-client-config required-projects: - openstack/keystoneauth - openstack/openstacksdk @@ -28,23 +15,27 @@ name: os-client-config-tox-tips check: jobs: - - os-client-config-tox-py27-tips - - os-client-config-tox-py35-tips + - os-client-config-tox-py37-tips gate: jobs: - - os-client-config-tox-py27-tips - - os-client-config-tox-py35-tips + - os-client-config-tox-py37-tips - project: templates: + - check-requirements + - lib-forward-testing-python3 + - openstack-lower-constraints-jobs + - openstack-python3-ussuri-jobs - os-client-config-tox-tips + - publish-openstack-docs-pti + - release-notes-jobs-python3 - shade-functional-tips - shade-tox-tips check: jobs: + - openstack-tox-pep8 - osc-functional-devstack-tips - - openstack-tox-lower-constraints gate: jobs: + - openstack-tox-pep8 - osc-functional-devstack-tips - - openstack-tox-lower-constraints