diff -Nru python-osc-lib-1.11.0/ChangeLog python-osc-lib-1.11.1/ChangeLog --- python-osc-lib-1.11.0/ChangeLog 2018-07-13 03:52:42.000000000 +0000 +++ python-osc-lib-1.11.1/ChangeLog 2018-08-15 12:46:28.000000000 +0000 @@ -1,6 +1,12 @@ CHANGES ======= +1.11.1 +------ + +* Revert "Fixes a bug with issubclass() being called on an instance" +* Update .gitreview for stable/rocky + 1.11.0 ------ diff -Nru python-osc-lib-1.11.0/debian/changelog python-osc-lib-1.11.1/debian/changelog --- python-osc-lib-1.11.0/debian/changelog 2018-07-31 13:44:11.000000000 +0000 +++ python-osc-lib-1.11.1/debian/changelog 2018-08-16 07:45:04.000000000 +0000 @@ -1,3 +1,10 @@ +python-osc-lib (1.11.1-0ubuntu1) cosmic; urgency=medium + + * New upstream point release for OpenStack Rocky. + * d/p/fix-py37-issubclass.patch: Update and rework. + + -- James Page Thu, 16 Aug 2018 08:45:04 +0100 + python-osc-lib (1.11.0-0ubuntu1) cosmic; urgency=medium * New upstream release for OpenStack Rocky. diff -Nru python-osc-lib-1.11.0/debian/patches/fix-py37-issubclass.patch python-osc-lib-1.11.1/debian/patches/fix-py37-issubclass.patch --- python-osc-lib-1.11.0/debian/patches/fix-py37-issubclass.patch 2018-07-31 13:44:11.000000000 +0000 +++ python-osc-lib-1.11.1/debian/patches/fix-py37-issubclass.patch 2018-08-16 07:45:04.000000000 +0000 @@ -13,12 +13,21 @@ --- a/osc_lib/utils/__init__.py +++ b/osc_lib/utils/__init__.py -@@ -492,7 +492,7 @@ +@@ -430,7 +430,7 @@ def get_dict_properties(item, fields, mi + data = item[field_name] if field_name in item else '' + if field in formatters: + formatter = formatters[field] +- if issubclass(formatter, cliff_columns.FormattableColumn): ++ if issubclass(type(formatter), cliff_columns.FormattableColumn): + data = formatter(data) + else: + warnings.warn( +@@ -492,7 +492,7 @@ def get_item_properties(item, fields, mi data = getattr(item, field_name, '') if field in formatters: formatter = formatters[field] - if issubclass(formatter, cliff_columns.FormattableColumn): -+ if isinstance(formatter, cliff_columns.FormattableColumn): ++ if issubclass(type(formatter), cliff_columns.FormattableColumn): data = formatter(data) else: warnings.warn( diff -Nru python-osc-lib-1.11.0/osc_lib/utils/__init__.py python-osc-lib-1.11.1/osc_lib/utils/__init__.py --- python-osc-lib-1.11.0/osc_lib/utils/__init__.py 2018-07-13 03:49:58.000000000 +0000 +++ python-osc-lib-1.11.1/osc_lib/utils/__init__.py 2018-08-15 12:42:43.000000000 +0000 @@ -430,7 +430,7 @@ data = item[field_name] if field_name in item else '' if field in formatters: formatter = formatters[field] - if isinstance(formatter, cliff_columns.FormattableColumn): + if issubclass(formatter, cliff_columns.FormattableColumn): data = formatter(data) else: warnings.warn( diff -Nru python-osc-lib-1.11.0/osc_lib.egg-info/pbr.json python-osc-lib-1.11.1/osc_lib.egg-info/pbr.json --- python-osc-lib-1.11.0/osc_lib.egg-info/pbr.json 2018-07-13 03:52:42.000000000 +0000 +++ python-osc-lib-1.11.1/osc_lib.egg-info/pbr.json 2018-08-15 12:46:29.000000000 +0000 @@ -1 +1 @@ -{"git_version": "8d28a59", "is_release": true} \ No newline at end of file +{"git_version": "a66f37d", "is_release": true} \ No newline at end of file diff -Nru python-osc-lib-1.11.0/osc_lib.egg-info/PKG-INFO python-osc-lib-1.11.1/osc_lib.egg-info/PKG-INFO --- python-osc-lib-1.11.0/osc_lib.egg-info/PKG-INFO 2018-07-13 03:52:42.000000000 +0000 +++ python-osc-lib-1.11.1/osc_lib.egg-info/PKG-INFO 2018-08-15 12:46:29.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: osc-lib -Version: 1.11.0 +Version: 1.11.1 Summary: OpenStackClient Library Home-page: https://docs.openstack.org/osc-lib/latest/ Author: OpenStack diff -Nru python-osc-lib-1.11.0/PKG-INFO python-osc-lib-1.11.1/PKG-INFO --- python-osc-lib-1.11.0/PKG-INFO 2018-07-13 03:52:44.000000000 +0000 +++ python-osc-lib-1.11.1/PKG-INFO 2018-08-15 12:46:30.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: osc-lib -Version: 1.11.0 +Version: 1.11.1 Summary: OpenStackClient Library Home-page: https://docs.openstack.org/osc-lib/latest/ Author: OpenStack diff -Nru python-osc-lib-1.11.0/releasenotes/notes/reno.cache python-osc-lib-1.11.1/releasenotes/notes/reno.cache --- python-osc-lib-1.11.0/releasenotes/notes/reno.cache 2018-07-13 03:52:44.000000000 +0000 +++ python-osc-lib-1.11.1/releasenotes/notes/reno.cache 2018-08-15 12:46:30.000000000 +0000 @@ -1,42 +1,3 @@ --- -file-contents: - releasenotes/notes/direct-openstacksdk-535a179f3c645cc0.yaml: - upgrade: ['The dependency on ``os-client-config`` has been removed in favor of - - direct use of ``openstacksdk``. - - '] - releasenotes/notes/find-project-203bf867619c557e.yaml: - features: ["Adds ``osc_lib.cli.identity.find_project()``. This function can be\n\ - used to look up a project ID from command-line options like:\n\n.. code-block::\ - \ python\n\n find_project(self.app.client_manager.sdk_connection,\n \ - \ parsed_args.project, parsed_args.project_domain)\n", 'Adds ``osc_lib.cli.identity.add_project_owner_option_to_parser()`` - - to register project and project domain options to CLI. - - '] - releasenotes/notes/none-auth-cli-48ab0e48d4852941.yaml: - fixes: ['It is now possible to specify the ``none`` auth type (via ``--os-auth-type`` - CLI argument or - - ``OS_AUTH_TYPE`` environment variable). To use it, ``--os-endpoint`` CLI argument - or - - ``OS_ENDPOINT`` environment variable must be specified. See `the bug - - `_ for more - detail.'] -notes: -- files: - - - releasenotes/notes/direct-openstacksdk-535a179f3c645cc0.yaml - - !!binary | - ZWU3OWY2MTY2ZTJmOTE3MjVkMDhmMTdkYzJlZTU5Y2E2NDg3Y2Q5Yg== - version: 1.11.0 -- files: - - - releasenotes/notes/find-project-203bf867619c557e.yaml - - !!binary | - ZGVlYzMyZDdlMDBiOTg0ZDE5OWY5MWZkZTAzN2QxMzkyZDJmYzc1Nw== - - - releasenotes/notes/none-auth-cli-48ab0e48d4852941.yaml - - !!binary | - Yjc2NGVmYzQ2ZmNlZTQ4Mzk0NzYxNjIwNjcyYTNhMWUxMTdhYTNkYg== - version: 1.10.0 +file-contents: {} +notes: [] diff -Nru python-osc-lib-1.11.0/RELEASENOTES.rst python-osc-lib-1.11.1/RELEASENOTES.rst --- python-osc-lib-1.11.0/RELEASENOTES.rst 2018-07-13 03:52:44.000000000 +0000 +++ python-osc-lib-1.11.1/RELEASENOTES.rst 2018-08-15 12:46:30.000000000 +0000 @@ -1,58 +1,3 @@ ======= osc-lib ======= - -.. _osc-lib_1.11.0: - -1.11.0 -====== - -.. _osc-lib_1.11.0_Upgrade Notes: - -Upgrade Notes -------------- - -.. releasenotes/notes/direct-openstacksdk-535a179f3c645cc0.yaml @ b'ee79f6166e2f91725d08f17dc2ee59ca6487cd9b' - -- The dependency on ``os-client-config`` has been removed in favor of - direct use of ``openstacksdk``. - - -.. _osc-lib_1.10.0: - -1.10.0 -====== - -.. _osc-lib_1.10.0_New Features: - -New Features ------------- - -.. releasenotes/notes/find-project-203bf867619c557e.yaml @ b'deec32d7e00b984d199f91fde037d1392d2fc757' - -- Adds ``osc_lib.cli.identity.find_project()``. This function can be - used to look up a project ID from command-line options like: - - .. code-block:: python - - find_project(self.app.client_manager.sdk_connection, - parsed_args.project, parsed_args.project_domain) - -.. releasenotes/notes/find-project-203bf867619c557e.yaml @ b'deec32d7e00b984d199f91fde037d1392d2fc757' - -- Adds ``osc_lib.cli.identity.add_project_owner_option_to_parser()`` - to register project and project domain options to CLI. - - -.. _osc-lib_1.10.0_Bug Fixes: - -Bug Fixes ---------- - -.. releasenotes/notes/none-auth-cli-48ab0e48d4852941.yaml @ b'b764efc46fcee48394761620672a3a1e117aa3db' - -- It is now possible to specify the ``none`` auth type (via ``--os-auth-type`` CLI argument or - ``OS_AUTH_TYPE`` environment variable). To use it, ``--os-endpoint`` CLI argument or - ``OS_ENDPOINT`` environment variable must be specified. See `the bug - `_ for more detail. -