Merge tag '2.4.0' into debian/wallaby

oslo.versionedobjects 2.4.0 release

meta:version: 2.4.0
meta:diff-start: -
meta:series: wallaby
meta:release-type: release
meta:pypi: yes
meta:first: yes
meta:release:Author: Moisés Guimarães de Medeiros <moguimar@redhat.com>
meta:release:Commit: Moisés Guimarães de Medeiros <moguimar@redhat.com>
meta:release:Change-Id: I23d0c1e884f63e0d083608d9ad59ea0ae4191c0b
meta:release:Code-Review+1: Daniel Bengtsson <dbengt@redhat.com>
meta:release:Code-Review+2: Hervé Beraud <hberaud@redhat.com>
meta:release:Code-Review+2: Sean McGinnis <sean.mcginnis@gmail.com>
meta:release:Workflow+1: Sean McGinnis <sean.mcginnis@gmail.com>

.pre-commit-config.yaml

+# We from the Oslo project decided to pin repos based on the
+# commit hash instead of the version tag to prevend arbitrary
+# code from running in developer's machines.  To update to a
+# newer version, run `pre-commit autoupdate` and then replace
+# the newer versions with their commit hash.
+
+default_language_version:
+  python: python3
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: ebc15addedad713c86ef18ae9632c88e187dd0af  # v3.1.0
+    hooks:
+      - id: trailing-whitespace
+      # Replaces or checks mixed line ending
+      - id: mixed-line-ending
+        args: ['--fix', 'lf']
+        exclude: '.*\.(svg)$'
+      # Forbid files which have a UTF-8 byte-order marker
+      - id: check-byte-order-marker
+      # Checks that non-binary executables have a proper shebang
+      - id: check-executables-have-shebangs
+      # Check for files that contain merge conflict strings.
+      - id: check-merge-conflict
+      # Check for debugger imports and py37+ breakpoint()
+      # calls in python source
+      - id: debug-statements
+      - id: check-yaml
+        files: .*\.(yaml|yml)$
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          - hacking>=3.0.1,<3.1.0

.zuul.yaml

@@ -6,7 +6,7 @@
       - check-requirements
       - lib-forward-testing-python3
       - openstack-lower-constraints-jobs
-      - openstack-python3-victoria-jobs
+      - openstack-python3-wallaby-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3

doc/source/conf.py

 # -*- coding: utf-8 -*-
+# Copyright (C) 2020 Red Hat, Inc.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -85,6 +87,3 @@ latex_documents = [
      u'%s Documentation' % project,
      u'OpenStack Foundation', 'manual'),
 ]
-
-# Example configuration for intersphinx: refer to the Python standard library.
-#intersphinx_mapping = {'http://docs.python.org/': None}

lower-constraints.txt

@@ -35,7 +35,7 @@ oslo.messaging==5.29.0
 oslo.middleware==3.31.0
 oslo.serialization==2.18.0
 oslo.service==1.24.0
-oslo.utils==3.33.0
+oslo.utils==4.7.0
 oslotest==3.2.0
 Paste==2.0.2
 PasteDeploy==1.5.0

oslo_versionedobjects/fixture.py

@@ -24,12 +24,12 @@ from collections import namedtuple
 from collections import OrderedDict
 import copy
 import datetime
-import hashlib
 import inspect
 import logging
 from unittest import mock
 
 import fixtures
+from oslo_utils.secretutils import md5
 from oslo_utils import versionutils as vutils
 
 from oslo_versionedobjects import base
@@ -271,8 +271,9 @@ class ObjectVersionChecker(object):
         if extra_data_func:
             relevant_data += extra_data_func(obj_class)
 
-        fingerprint = '%s-%s' % (obj_class.VERSION, hashlib.md5(
-            bytes(repr(relevant_data).encode())).hexdigest())
+        fingerprint = '%s-%s' % (obj_class.VERSION, md5(
+            bytes(repr(relevant_data).encode()),
+            usedforsecurity=False).hexdigest())
         return fingerprint
 
     def get_hashes(self, extra_data_func=None):

releasenotes/notes/update_md5_for_fips-e5a8f8f438ac81fb.yaml

+---
+features:
+  - Updated _get_fingerprint to use new oslo.utils encapsulation of md5 to
+    allow md5 hashes to be returned on a FIPS enabled system.

releasenotes/source/index.rst

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

releasenotes/source/victoria.rst

+=============================
+Victoria Series Release Notes
+=============================
+
+.. release-notes::
+   :branch: stable/victoria

requirements.txt

@@ -6,7 +6,7 @@ oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
 oslo.messaging>=5.29.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
-oslo.utils>=3.33.0 # Apache-2.0
+oslo.utils>=4.7.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
 oslo.log>=3.36.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0

test-requirements.txt

@@ -12,3 +12,5 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 
 # Bandit security code scanner
 bandit>=1.6.0,<1.7.0 # Apache-2.0
+
+pre-commit>=2.6.0 # MIT

tox.ini

@@ -12,7 +12,7 @@ commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 commands =
-  flake8
+  pre-commit run -a
   # Run security linter
   bandit -r oslo_versionedobjects tests -n5 --skip B303