Merge tag '3.0.1' into debian/zed

oslo.versionedobjects 3.0.1 release

meta:version: 3.0.1
meta:diff-start: -
meta:series: zed
meta:release-type: release
meta:pypi: yes
meta:first: no
meta:release:Author: Elod Illes <elod.illes@est.tech>
meta:release:Commit: Elod Illes <elod.illes@est.tech>
meta:release:Change-Id: Ib2c0e782b9a8722eae6fbd6c8046247e37f7a914
meta:release:Code-Review+1: Daniel Bengtsson <dbengt@redhat.com>
meta:release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta:release:Code-Review+2: Thierry Carrez <thierry@openstack.org>
meta:release:Workflow+1: Thierry Carrez <thierry@openstack.org>

.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

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'),
 ]

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'),

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))

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=<?>,"

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'),
 ]

releasenotes/source/index.rst

@@ -6,6 +6,7 @@
    :maxdepth: 1
 
    unreleased
+   yoga
    xena
    wallaby
    victoria

releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po

 # Andi Chandler <andi@gowling.com>, 2017. #zanata
 # Andi Chandler <andi@gowling.com>, 2018. #zanata
 # Andi Chandler <andi@gowling.com>, 2020. #zanata
+# Andi Chandler <andi@gowling.com>, 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 <andi@gowling.com>\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"

releasenotes/source/yoga.rst

+=========================
+Yoga Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/yoga

setup.cfg

 [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