diff --git a/.zuul.yaml b/.zuul.yaml index 2818143efada66c13c472b00cb03bc1d4fc4a40d..816fe74a80dff8f02af27ad598a91b2ee660a553 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 diff --git a/doc/source/conf.py b/doc/source/conf.py index 834bf69a1521c6a738547db1070961656cee7287..97e76bc15a7ebc67b4a7358d953c8bd76020b4b2 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 0b2ea9d905e14e3bee4a49252e60182b77dc1854..0c92c67690d4f4438103c74c0f6afbf06bef3ca8 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_fixture.py b/oslo_versionedobjects/tests/test_fixture.py index f43d4df2beb5959806316c6447b28a6592f11ea8..47211e91a656cd69f6ac3460b2f85e122adefe07 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)) diff --git a/oslo_versionedobjects/tests/test_objects.py b/oslo_versionedobjects/tests/test_objects.py index 0b21f5048a2c503a56d49de615594dea84a5c28d..961baae8578e54f0d673b7395eb7768559143f61 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 cdeb821d8e788732503eb8a10c87815c4d59a7e8..c4bd4964c0707265c9546b3f2ae7079322a71d8a 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'), ] diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 06780ac9da8d0074d72c8c464be80f14e1481796..3c5f7c2ab57ad4f935f3c4de265eee7c511d51a8 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/locale/en_GB/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po index eda0fb7254cc016c653095af7b49b516b5cfc64b..52fcf83e315af36b117cebe99705fbf616f4bb97 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" diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst new file mode 100644 index 0000000000000000000000000000000000000000..7cd5e908a7de01e943ed55fdd485eb0e393ba1c3 --- /dev/null +++ b/releasenotes/source/yoga.rst @@ -0,0 +1,6 @@ +========================= +Yoga Series Release Notes +========================= + +.. release-notes:: + :branch: stable/yoga diff --git a/setup.cfg b/setup.cfg index 33bbb7a53ea7df4c94ffd1f335709a0f30a8c727..7f9bee773acbb05a3c848e868beb363dbf869943 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.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