From 3c7ae141c74423ed9ff9307ad3dcfebc0685996e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 6 Feb 2022 02:13:23 +0900 Subject: [PATCH 1/7] setup.cfg: Replace dashes by underscores Since setuptools v54.1.0[1], the parmeters with dash have been deprecated in favor of the new parameters with underscore. This change updates the parameters accordingly to avoid the warnings like the example below. UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead [1] https://github.com/pypa/setuptools/commit/a2e9ae4cb Change-Id: I8bbe0e6e4b828cd9dc5928e5bebd085b9411f86e --- setup.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 33bbb7a..4a30053 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] name = oslo.versionedobjects summary = Oslo Versioned Objects library -description-file = +description_file = README.rst author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/oslo.versionedobjects/latest/ -python-requires = >=3.6 +author_email = openstack-discuss@lists.openstack.org +home_page = https://docs.openstack.org/oslo.versionedobjects/latest/ +python_requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology -- GitLab From 7f2dcd0e9f80e5695c3105e28ab45c3ed82d9ede Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 4 Mar 2022 17:20:21 +0000 Subject: [PATCH 2/7] Update master for stable/yoga Add file to the reno documentation build to show release notes for stable/yoga. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/yoga. Sem-Ver: feature Change-Id: I93b5a3ec5d179253c8c6b3c4ab262782456aa8da --- releasenotes/source/index.rst | 1 + releasenotes/source/yoga.rst | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/source/yoga.rst diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 06780ac..3c5f7c2 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + yoga xena wallaby victoria diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst new file mode 100644 index 0000000..7cd5e90 --- /dev/null +++ b/releasenotes/source/yoga.rst @@ -0,0 +1,6 @@ +========================= +Yoga Series Release Notes +========================= + +.. release-notes:: + :branch: stable/yoga -- GitLab From 16bfe43204cfc94accf238674b4b1205d9e7d9b8 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 4 Mar 2022 17:20:23 +0000 Subject: [PATCH 3/7] Add Python3 zed unit tests This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for zed. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: I91aaa14478b6bdb20e79b017486e1ae3bee74f8c --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 2818143..816fe74 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -5,7 +5,7 @@ templates: - check-requirements - lib-forward-testing-python3 - - openstack-python3-yoga-jobs + - openstack-python3-zed-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 -- GitLab From d901c426559835bd2e8eab7f9d8f1a86cf28fe81 Mon Sep 17 00:00:00 2001 From: songwenping Date: Tue, 19 Apr 2022 19:36:17 +0800 Subject: [PATCH 4/7] Remove unnecessary unicode prefixes Change-Id: If5bc9397a87cc8d4260e50b793ed352dbd012c0c --- doc/source/conf.py | 8 ++++---- oslo_versionedobjects/tests/test_fields.py | 2 +- oslo_versionedobjects/tests/test_objects.py | 10 +++++----- releasenotes/source/conf.py | 16 ++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 834bf69..97e76bc 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -45,8 +45,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'oslo.versionedobjects' -copyright = u'2014, OpenStack Foundation' +project = 'oslo.versionedobjects' +copyright = '2014, OpenStack Foundation' source_tree = 'https://opendev.org/openstack/%s' % project # If true, '()' will be appended to :func: etc. cross-reference text. @@ -84,6 +84,6 @@ htmlhelp_basename = '%sdoc' % project latex_documents = [ ('index', '%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Foundation', 'manual'), + '%s Documentation' % project, + 'OpenStack Foundation', 'manual'), ] diff --git a/oslo_versionedobjects/tests/test_fields.py b/oslo_versionedobjects/tests/test_fields.py index 0b2ea9d..0c92c67 100644 --- a/oslo_versionedobjects/tests/test_fields.py +++ b/oslo_versionedobjects/tests/test_fields.py @@ -283,7 +283,7 @@ class TestUUID(TestField): ('da66a411-af0e-4829-9b67-475017ddz152', 'da66a411-af0e-4829-9b67-475017ddz152'), ('fake_uuid', 'fake_uuid'), - (u'fake_uāid', u'fake_uāid'), + ('fake_uāid', 'fake_uāid'), (b'fake_u\xe1id'.decode('latin_1'), b'fake_u\xe1id'.decode('latin_1')), ('1', '1'), diff --git a/oslo_versionedobjects/tests/test_objects.py b/oslo_versionedobjects/tests/test_objects.py index 0b21f50..961baae 100644 --- a/oslo_versionedobjects/tests/test_objects.py +++ b/oslo_versionedobjects/tests/test_objects.py @@ -849,7 +849,7 @@ class _TestObject(object): self.assertRaises(ValueError, fail) def test_object_dict_syntax(self): - obj = MyObj(foo=123, bar=u'text') + obj = MyObj(foo=123, bar='text') self.assertEqual(obj['foo'], 123) self.assertIn('bar', obj) self.assertNotIn('missing', obj) @@ -858,11 +858,11 @@ class _TestObject(object): self.assertEqual(sorted(obj.keys()), ['bar', 'foo']) self.assertEqual(sorted(obj.values(), key=str), - [123, u'text']) + [123, 'text']) self.assertEqual(sorted(obj.items()), - [('bar', u'text'), ('foo', 123)]) + [('bar', 'text'), ('foo', 123)]) self.assertEqual(dict(obj), - {'foo': 123, 'bar': u'text'}) + {'foo': 123, 'bar': 'text'}) def test_non_dict_remotable(self): @base.VersionedObjectRegistry.register @@ -1195,7 +1195,7 @@ class _TestObject(object): self.assertEqual('MySensitiveObj(data=)', repr(obj2)) def test_obj_repr_unicode(self): - obj = MyObj(bar=u'\u0191\u01A1\u01A1') + obj = MyObj(bar='\u0191\u01A1\u01A1') # verify the unicode string has been encoded as ASCII if on python 2 self.assertEqual("MyObj(bar='\u0191\u01A1\u01A1',foo=," "missing=,mutable_default=,readonly=," diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index cdeb821..c4bd496 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -58,8 +58,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'oslo.versionedobjects Release Notes' -copyright = u'2016, oslo.versionedobjects Developers' +project = 'oslo.versionedobjects Release Notes' +copyright = '2016, oslo.versionedobjects Developers' # Release notes do not need a version in the title, they span # multiple versions. @@ -206,8 +206,8 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'oslo.versionedobjectsReleaseNotes.tex', - u'oslo.versionedobjects Release Notes Documentation', - u'oslo.versionedobjects Developers', 'manual'), + 'oslo.versionedobjects Release Notes Documentation', + 'oslo.versionedobjects Developers', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -237,8 +237,8 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'oslo.versionedobjectsReleaseNotes', - u'oslo.versionedobjects Release Notes Documentation', - [u'oslo.versionedobjects Developers'], 1) + 'oslo.versionedobjects Release Notes Documentation', + ['oslo.versionedobjects Developers'], 1) ] # If true, show URL addresses after external links. @@ -252,8 +252,8 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'oslo.versionedobjectsReleaseNotes', - u'oslo.versionedobjects Release Notes Documentation', - u'oslo.versionedobjects Developers', 'oslo.versionedobjectsReleaseNotes', + 'oslo.versionedobjects Release Notes Documentation', + 'oslo.versionedobjects Developers', 'oslo.versionedobjectsReleaseNotes', 'One line description of project.', 'Miscellaneous'), ] -- GitLab From 0c92b58eea3b06aa7af9c12f5d64cf8665c8eeca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Thu, 5 May 2022 11:42:41 +0200 Subject: [PATCH 5/7] Drop python3.6/3.7 support in testing runtime In Zed cycle testing runtime, we are targetting to drop the python 3.6/3.7 support, project started adding python 3.8 as minimum, example nova: - https://github.com/openstack/nova/blob/56b5aed08c6a3ed81b78dc216f0165ebfe3c3350/setup.cfg#L13 Change-Id: Id06d85f7e7638935dcfebbeb7cd54fa404767b43 --- setup.cfg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4a30053..7f9bee7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ description_file = author = OpenStack author_email = openstack-discuss@lists.openstack.org home_page = https://docs.openstack.org/oslo.versionedobjects/latest/ -python_requires = >=3.6 +python_requires = >=3.8 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -15,8 +15,6 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3 :: Only -- GitLab From cec2b8e8f016204caa7848243e42c495a0dca195 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 21 Jun 2022 03:59:03 +0000 Subject: [PATCH 6/7] Imported Translations from Zanata For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: Ia3c6e0783baaa4853c3a3373ca14f6b88ddd2515 --- .../locale/en_GB/LC_MESSAGES/releasenotes.po | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po index eda0fb7..52fcf83 100644 --- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po +++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po @@ -1,15 +1,16 @@ # Andi Chandler , 2017. #zanata # Andi Chandler , 2018. #zanata # Andi Chandler , 2020. #zanata +# Andi Chandler , 2022. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.versionedobjects\n" +"Project-Id-Version: oslo.versionedobjects Release Notes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-21 17:26+0000\n" +"POT-Creation-Date: 2022-05-11 16:10+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2020-05-04 09:27+0000\n" +"PO-Revision-Date: 2022-06-13 07:39+0000\n" "Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -22,12 +23,18 @@ msgstr "1.19.0" msgid "2.0.0" msgstr "2.0.0" +msgid "2.4.0" +msgstr "2.4.0" + msgid "Current Series Release Notes" msgstr "Current Series Release Notes" msgid "Introduce reno for deployer release notes." msgstr "Introduce Reno for deployer release notes." +msgid "New Features" +msgstr "New Features" + msgid "Ocata Series Release Notes" msgstr "Ocata Series Release Notes" @@ -56,11 +63,30 @@ msgstr "" msgid "Train Series Release Notes" msgstr "Train Series Release Notes" +msgid "" +"Updated _get_fingerprint to use new oslo.utils encapsulation of md5 to allow " +"md5 hashes to be returned on a FIPS enabled system." +msgstr "" +"Updated _get_fingerprint to use new oslo.utils encapsulation of MD5 to allow " +"MD5 hashes to be returned on a FIPS-enabled system." + msgid "Upgrade Notes" msgstr "Upgrade Notes" msgid "Ussuri Series Release Notes" msgstr "Ussuri Series Release Notes" +msgid "Victoria Series Release Notes" +msgstr "Victoria Series Release Notes" + +msgid "Wallaby Series Release Notes" +msgstr "Wallaby Series Release Notes" + +msgid "Xena Series Release Notes" +msgstr "Xena Series Release Notes" + +msgid "Yoga Series Release Notes" +msgstr "Yoga Series Release Notes" + msgid "oslo.versionedobjects Release Notes" msgstr "oslo.versionedobjects Release Notes" -- GitLab From 2b1202938afad9ac174f86f1e6b2ec7a0bf5c743 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 26 Jul 2022 16:38:54 +0200 Subject: [PATCH 7/7] Python3.11: Do not use inspect.ArgSpec Python3.11 will remove inspect.ArgSpec and cause test failures on the CI. Closes-Bug: #1982851 Change-Id: I4bc4ab6cfeb3d15072145aa093d3407f35ddf41e --- oslo_versionedobjects/tests/test_fixture.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/oslo_versionedobjects/tests/test_fixture.py b/oslo_versionedobjects/tests/test_fixture.py index f43d4df..47211e9 100644 --- a/oslo_versionedobjects/tests/test_fixture.py +++ b/oslo_versionedobjects/tests/test_fixture.py @@ -757,11 +757,15 @@ class TestMethodSpec(test.TestCase): self._test_method3 = test_method3 def test_method_spec_compat(self): - self.assertEqual(inspect.ArgSpec(args=['a', 'b', 'kw1'], varargs=None, - keywords='kwargs', defaults=(123,)), + self.assertEqual(fixture.CompatArgSpec(args=['a', 'b', 'kw1'], + varargs=None, + keywords='kwargs', + defaults=(123,)), fixture.get_method_spec(self._test_method1)) - self.assertEqual(inspect.ArgSpec(args=['a', 'b'], varargs='args', - keywords=None, defaults=None), + self.assertEqual(fixture.CompatArgSpec(args=['a', 'b'], + varargs='args', + keywords=None, + defaults=None), fixture.get_method_spec(self._test_method2)) self.assertEqual(inspect.getfullargspec(self._test_method3), fixture.get_method_spec(self._test_method3)) -- GitLab