From a2e76d648a35a84ce53637311e50c1e4bea98c4c Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 10 Sep 2021 14:40:46 +0000 Subject: [PATCH 1/4] Update master for stable/xena Add file to the reno documentation build to show release notes for stable/xena. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/xena. Sem-Ver: feature Change-Id: Ie1e7be2d3c88b4ba376d4d6a2f4c8ee01a752dcd --- releasenotes/source/index.rst | 1 + releasenotes/source/xena.rst | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/source/xena.rst diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 492b5f3..7200d32 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + xena wallaby victoria ussuri diff --git a/releasenotes/source/xena.rst b/releasenotes/source/xena.rst new file mode 100644 index 0000000..1be85be --- /dev/null +++ b/releasenotes/source/xena.rst @@ -0,0 +1,6 @@ +========================= +Xena Series Release Notes +========================= + +.. release-notes:: + :branch: stable/xena -- GitLab From a34a95b4e9103071ff7a2a3fb7d18c877cf5c2dc Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 10 Sep 2021 14:40:47 +0000 Subject: [PATCH 2/4] Add Python3 yoga unit tests This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for yoga. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: I5a18c7d409473150ab6cf01181969a78d359464f --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 81fe9a1..a9c3823 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,6 +2,6 @@ templates: - check-requirements - lib-forward-testing-python3 - - openstack-python3-xena-jobs + - openstack-python3-yoga-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 -- GitLab From e991194cbd82925c8bac43cb979f9262a49850e6 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 21 Sep 2021 15:41:58 +0100 Subject: [PATCH 3/4] Don't use 'requests.PreparedRequest' We're using 'requests.PreparedRequest' in one place in the tests. However, the requests docs have a warning that one shouldn't do this: Instances are generated from a Request object, and should not be instantiated manually; doing so may produce undesirable effects. It seems we're now seeing just such an effect, as requests has started attempting to do proxy-related things resulting in the following error: Traceback (most recent call last): File "/usr/lib64/python3.6/unittest/mock.py", line 1183, in patched return func(*args, **keywargs) File ".../oslo.vmware/oslo_vmware/tests/test_service.py", line 518, in test_send_with_local_file_url resp = transport.session.send(request) File ".../oslo.vmware/.tox/py36/lib/python3.6/site-packages/requests/sessions.py", line 636, in send kwargs.setdefault('proxies', self.rebuild_proxies(request, self.proxies)) File ".../oslo.vmware/.tox/py36/lib/python3.6/site-packages/requests/sessions.py", line 301, in rebuild_proxies if 'Proxy-Authorization' in headers: TypeError: argument of type 'NoneType' is not iterable Do what we should have done from the beginning and use 'requests.Request.prepare' instead. [1] https://docs.python-requests.org/en/master/api/#requests.PreparedRequest Change-Id: I072c64904298cf83cb113e402d85fb62626f39f7 Signed-off-by: Stephen Finucane --- oslo_vmware/tests/test_service.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/oslo_vmware/tests/test_service.py b/oslo_vmware/tests/test_service.py index b03c3ff..29f7286 100644 --- a/oslo_vmware/tests/test_service.py +++ b/oslo_vmware/tests/test_service.py @@ -493,8 +493,7 @@ class RequestsTransportTest(base.TestCase): transport = service.RequestsTransport() url = 'file:///foo' - request = requests.PreparedRequest() - request.url = url + request = requests.Request('GET', url).prepare() data = b"Hello World" get_size_mock.return_value = len(data) @@ -502,7 +501,6 @@ class RequestsTransportTest(base.TestCase): def read_mock(): return data - builtin_open = 'builtins.open' open_mock = mock.MagicMock(name='file_handle', spec=open) file_spec = list(set(dir(io.TextIOWrapper)).union( @@ -514,7 +512,7 @@ class RequestsTransportTest(base.TestCase): file_handle.read.side_effect = read_mock open_mock.return_value = file_handle - with mock.patch(builtin_open, open_mock, create=True): + with mock.patch('builtins.open', open_mock, create=True): resp = transport.session.send(request) self.assertEqual(data, resp.content) -- GitLab From 7bc343173751330d2e989c28bc6fefed56d358d6 Mon Sep 17 00:00:00 2001 From: Gunju Kim Date: Mon, 11 Oct 2021 14:49:33 +0900 Subject: [PATCH 4/4] Replace suds-jurko with suds-community suds-jurko is not compatible with setuptools >58.0.0 and has not been maintained for a long time. Let's use suds-community instead. Related-Bug: 1946340 Depends-On: I4eb235c3ad0f1296fc81a9b98d7e687ac9923b59 Change-Id: Ie3f317974d138be4050d0ce196bcc000494a0eee --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b4ef5f4..924e1d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ oslo.utils>=3.33.0 # Apache-2.0 PyYAML>=3.13 # MIT lxml>=4.5.0 # BSD -suds-jurko>=0.6 # LGPLv3+ +suds-community>=0.6 # LGPLv3+ eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT requests>=2.14.2 # Apache-2.0 urllib3>=1.21.1 # MIT -- GitLab