From 2180bc12673a8b89b7df6649767b663e07baf580e8e2fc92c902fec0c48bfc96 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 4 Jun 2024 20:05:52 +0000 Subject: [PATCH] - removed 0001-Fix-unit-tests-broken-by-requests-mock-1.12.0.patch - update to version 4.6.0 - reno: Update master for victoria Unmaintained status - Remove incorrect validation for glance-download import method - Update master for stable/2024.1 - reno: Update master for yoga Unmaintained status - Remove unused fallback to simplejson - Fix unit tests broken by requests-mock >= 1.12.0 - reno: Update master for unmaintained/zed - Release notes for 4.6.0 - Do not leak X-Auth-Token when logging curl requests - Update master for stable/2023.2 - reno: Update master for wallaby Unmaintained status - Exclude tests directory from coverage calculation - reno: Update master for xena Unmaintained status - Bump hacking - Update python classifier in setup.cfg - Tests: Fix original_only wrapper OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-glanceclient?expand=0&rev=72 --- ...tests-broken-by-requests-mock-1.12.0.patch | 45 ------------------- python-glanceclient-4.4.1.tar.gz | 3 -- python-glanceclient-4.6.0.tar.gz | 3 ++ python-glanceclient.changes | 22 +++++++++ python-glanceclient.spec | 12 +++-- 5 files changed, 30 insertions(+), 55 deletions(-) delete mode 100644 0001-Fix-unit-tests-broken-by-requests-mock-1.12.0.patch delete mode 100644 python-glanceclient-4.4.1.tar.gz create mode 100644 python-glanceclient-4.6.0.tar.gz diff --git a/0001-Fix-unit-tests-broken-by-requests-mock-1.12.0.patch b/0001-Fix-unit-tests-broken-by-requests-mock-1.12.0.patch deleted file mode 100644 index 3625c38..0000000 --- a/0001-Fix-unit-tests-broken-by-requests-mock-1.12.0.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 300b8c8262d8dcdca7a8d753c3fb8a22cae02d40 Mon Sep 17 00:00:00 2001 -From: Takashi Kajinami -Date: Sun, 28 Apr 2024 22:19:24 +0900 -Subject: [PATCH] Fix unit tests broken by requests-mock >= 1.12.0 - -requests-mock removed the old compatibility code in 1.12.0[1] and now -usage of a bare dict for response header causes AttributeError. - -[1] https://github.com/jamielennox/requests-mock/commit/e3bd0d1a92e40fa9cb1d587c59157020a45de620 - -Closes-Bug: #2064011 -Change-Id: Iee86fa3eae86102112987b8648ada73d37ac58e8 ---- - glanceclient/tests/utils.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/glanceclient/tests/utils.py b/glanceclient/tests/utils.py -index 730b928..750fb7e 100644 ---- a/glanceclient/tests/utils.py -+++ b/glanceclient/tests/utils.py -@@ -14,6 +14,7 @@ - # under the License. - - import copy -+from email.message import EmailMessage - import io - import json - import testtools -@@ -112,7 +113,12 @@ class FakeResponse(object): - self.body = body - self.reason = reason - self.version = version -- self.headers = headers -+ # NOTE(tkajinam): Make the FakeResponse class compatible with -+ # http.client.HTTPResponse -+ # https://docs.python.org/3/library/http.client.html -+ self.headers = EmailMessage() -+ for header_key in headers: -+ self.headers[header_key] = headers[header_key] - self.headers['x-openstack-request-id'] = 'req-1234' - self.status_code = status_code - self.raw = RawRequest(headers, body=body, reason=reason, --- -2.44.0 - diff --git a/python-glanceclient-4.4.1.tar.gz b/python-glanceclient-4.4.1.tar.gz deleted file mode 100644 index ff4b612..0000000 --- a/python-glanceclient-4.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cf7ebf61e28b310df8538420d1788b094f82b9fbab96f793e555ced0ce3aaa3 -size 205731 diff --git a/python-glanceclient-4.6.0.tar.gz b/python-glanceclient-4.6.0.tar.gz new file mode 100644 index 0000000..977cd3c --- /dev/null +++ b/python-glanceclient-4.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8099b84f3c6d223be4a4e95b37cd8c3db6342660dd8b09443061b166f4d1f8fa +size 206480 diff --git a/python-glanceclient.changes b/python-glanceclient.changes index 355eef3..6ff08dd 100644 --- a/python-glanceclient.changes +++ b/python-glanceclient.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jun 4 20:05:19 UTC 2024 - cloud-devel@suse.de + +- removed 0001-Fix-unit-tests-broken-by-requests-mock-1.12.0.patch +- update to version 4.6.0 + - reno: Update master for victoria Unmaintained status + - Remove incorrect validation for glance-download import method + - Update master for stable/2024.1 + - reno: Update master for yoga Unmaintained status + - Remove unused fallback to simplejson + - Fix unit tests broken by requests-mock >= 1.12.0 + - reno: Update master for unmaintained/zed + - Release notes for 4.6.0 + - Do not leak X-Auth-Token when logging curl requests + - Update master for stable/2023.2 + - reno: Update master for wallaby Unmaintained status + - Exclude tests directory from coverage calculation + - reno: Update master for xena Unmaintained status + - Bump hacking + - Update python classifier in setup.cfg + - Tests: Fix original_only wrapper + ------------------------------------------------------------------- Mon May 6 11:04:35 UTC 2024 - cloud-devel@suse.de diff --git a/python-glanceclient.spec b/python-glanceclient.spec index 412af47..cc3d344 100644 --- a/python-glanceclient.spec +++ b/python-glanceclient.spec @@ -17,16 +17,14 @@ Name: python-glanceclient -Version: 4.4.1 +Version: 4.6.0 Release: 0 Epoch: 0 Summary: Python API and CLI for OpenStack Glance License: Apache-2.0 Group: Development/Languages/Python URL: https://docs.openstack.org/python-glanceclient -Source0: https://files.pythonhosted.org/packages/source/p/python-glanceclient/python-glanceclient-4.4.1.tar.gz -# https://review.opendev.org/c/openstack/python-glanceclient/+/917275 -Patch1: 0001-Fix-unit-tests-broken-by-requests-mock-1.12.0.patch +Source0: https://files.pythonhosted.org/packages/source/p/python-glanceclient/python-glanceclient-4.6.0.tar.gz BuildRequires: openstack-macros BuildRequires: python3-PrettyTable >= 0.7.1 BuildRequires: python3-ddt @@ -84,15 +82,15 @@ glanceclient module), and a command-line script (glance). Each implements This package contains auto-generated documentation. %prep -%autosetup -p1 -n python-glanceclient-4.4.1 +%autosetup -p1 -n python-glanceclient-4.6.0 %py_req_cleanup %build %py3_build # generate html docs -PBR_VERSION=4.4.1 %sphinx_build -b html doc/source doc/build/html -PBR_VERSION=4.4.1 %sphinx_build -b man doc/source doc/build/man +PBR_VERSION=4.6.0 %sphinx_build -b html doc/source doc/build/html +PBR_VERSION=4.6.0 %sphinx_build -b man doc/source doc/build/man # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} rm -rf doc/build/man/.{doctrees,buildinfo}