Merge tag '2.5.0' into debian/xena

oslo.versionedobjects 2.5.0 release

meta:version: 2.5.0
meta:diff-start: -
meta:series: xena
meta:release-type: release
meta:pypi: yes
meta:first: yes
meta:release:Author: Hervé Beraud <hberaud@redhat.com>
meta:release:Commit: Hervé Beraud <hberaud@redhat.com>
meta:release:Change-Id: I27a4ec0615c6ca7291b25ad0aa9663503404c4c0
meta:release:Code-Review+2: Hervé Beraud <herveberaud.pro@gmail.com>
meta:release:Code-Review+2: Thierry Carrez <thierry@openstack.org>
meta:release:Workflow+1: Thierry Carrez <thierry@openstack.org>

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: ebc15addedad713c86ef18ae9632c88e187dd0af  # v3.1.0
+    rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
     hooks:
       - id: trailing-whitespace
       # Replaces or checks mixed line ending
@@ -27,9 +27,13 @@ repos:
       - id: debug-statements
       - id: check-yaml
         files: .*\.(yaml|yml)$
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3
+  - repo: local
     hooks:
       - id: flake8
+        name: flake8
         additional_dependencies:
           - hacking>=3.0.1,<3.1.0
+        language: python
+        entry: flake8
+        files: '^.*\.py$'
+        exclude: '^(doc|releasenotes|tools)/.*$'

.zuul.yaml

@@ -5,8 +5,7 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-lower-constraints-jobs
-      - openstack-python3-wallaby-jobs
+      - openstack-python3-xena-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3

lower-constraints.txt

-amqp==2.1.1
-appdirs==1.3.0
-Babel==2.3.4
-bandit==1.4.0
-cachetools==2.0.0
-contextlib2==0.4.0
-coverage==4.0
-debtcollector==1.2.0
-eventlet==0.18.2
-extras==1.0.0
-fasteners==0.7.0
-fixtures==3.0.0
-futurist==1.2.0
-gitdb==0.6.4
-GitPython==1.0.1
-greenlet==0.4.15
-iso8601==0.1.11
-Jinja2==2.10
-jsonschema==3.2.0
-keystoneauth1==3.4.0
-kombu==4.0.0
-linecache2==1.0.0
-MarkupSafe==1.1.1
-mox3==0.20.0
-msgpack-python==0.4.0
-netaddr==0.7.18
-netifaces==0.10.4
-os-client-config==1.28.0
-oslo.concurrency==3.26.0
-oslo.config==5.2.0
-oslo.context==2.19.2
-oslo.i18n==3.15.3
-oslo.log==3.36.0
-oslo.messaging==5.29.0
-oslo.middleware==3.31.0
-oslo.serialization==2.18.0
-oslo.service==1.24.0
-oslo.utils==4.7.0
-oslotest==3.2.0
-Paste==2.0.2
-PasteDeploy==1.5.0
-pbr==2.0.0
-pika==0.10.0
-pika-pool==0.1.3
-prettytable==0.7.2
-pyinotify==0.9.6
-pyparsing==2.1.0
-python-dateutil==2.5.3
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.13
-repoze.lru==0.7
-requests==2.14.2
-requestsexceptions==1.2.0
-rfc3986==0.3.1
-Routes==2.3.1
-six==1.10.0
-smmap==0.9.0
-statsd==3.2.1
-stestr==2.0.0
-stevedore==1.20.0
-tenacity==3.2.1
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
-vine==1.1.4
-WebOb==1.7.1
-wrapt==1.7.0

oslo_versionedobjects/test.py

@@ -178,8 +178,8 @@ class TestCase(testtools.TestCase):
                          baseclass)
 
         for name in sorted(implmethods.keys()):
-            baseargs = inspect.getargspec(basemethods[name])
-            implargs = inspect.getargspec(implmethods[name])
+            baseargs = inspect.getfullargspec(basemethods[name])
+            implargs = inspect.getfullargspec(implmethods[name])
 
             self.assertEqual(baseargs, implargs,
                              "%s args don't match base class %s" %

oslo_versionedobjects/tests/test_fixture.py

@@ -584,7 +584,7 @@ class TestObjectVersionChecker(test.TestCase):
         argspec = 'cubone'
         self._add_class(self.obj_classes, ExtraDataObj)
 
-        with mock.patch('inspect.getargspec') as mock_gas:
+        with mock.patch.object(fixture, 'get_method_spec') as mock_gas:
             mock_gas.return_value = argspec
             fp = self.ovc._get_fingerprint(ExtraDataObj.__name__,
                                            extra_data_func=get_data)
@@ -757,9 +757,11 @@ class TestMethodSpec(test.TestCase):
         self._test_method3 = test_method3
 
     def test_method_spec_compat(self):
-        self.assertEqual(inspect.getargspec(self._test_method1),
+        self.assertEqual(inspect.ArgSpec(args=['a', 'b', 'kw1'], varargs=None,
+                                         keywords='kwargs', defaults=(123,)),
                          fixture.get_method_spec(self._test_method1))
-        self.assertEqual(inspect.getargspec(self._test_method2),
+        self.assertEqual(inspect.ArgSpec(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))

releasenotes/source/index.rst

@@ -6,6 +6,7 @@
    :maxdepth: 1
 
    unreleased
+   wallaby
    victoria
    ussuri
    train

releasenotes/source/wallaby.rst

+============================
+Wallaby Series Release Notes
+============================
+
+.. release-notes::
+   :branch: stable/wallaby

tox.ini

 [tox]
-minversion = 3.1.1
-envlist = py38,pep8
+minversion = 3.18.0
+envlist = py3,pep8
 basepython = python3
 ignore_basepython_conflict = true
 
 [testenv]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
@@ -23,27 +23,21 @@ commands = {posargs}
 commands = python setup.py test --coverage --coverage-package-name=oslo_versionedobjects --testr-args='{posargs}'
 
 [testenv:docs]
-whitelist_externals = rm
+allowlist_externals = rm
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands =
   rm -fr doc/build
   sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:releasenotes]
-whitelist_externals = rm
+allowlist_externals = rm
 deps = {[testenv:docs]deps}
 commands =
   rm -rf releasenotes/build
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
-
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 # W504 skipped as you must choose this or W503