Merge tag '2.5.0' into debian/wallaby

oslo.service 2.5.0 release

meta:version: 2.5.0
meta:diff-start: -
meta:series: wallaby
meta:release-type: release
meta:pypi: yes
meta:first: yes
meta:release:Author: Daniel Bengtsson <dbengt@redhat.com>
meta:release:Commit: Daniel Bengtsson <dbengt@redhat.com>
meta:release:Change-Id: I712e9ad4b4b998b80ca71fe53fea1a6cbf328e3c
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

@@ -2,8 +2,7 @@
     templates:
       - 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
@@ -77,6 +79,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}

oslo_service/__init__.py

-# 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
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import os
-
-import eventlet.patcher
-
-
-time = eventlet.patcher.original('time')
-
-
-def service_hub():
-    # NOTE(dims): Add a custom impl for EVENTLET_HUB, so we can
-    # override the clock used in the eventlet hubs. The default
-    # uses time.time() and we need to use a monotonic timer
-    # to ensure that things like loopingcall work properly.
-    hub = eventlet.hubs.get_default_hub().Hub()
-    hub.clock = time.monotonic
-    # get_default_hub() will return a hub that is supported on this platform
-    hub.is_available = lambda: True
-    return hub
-
-
-os.environ['EVENTLET_HUB'] = 'oslo_service:service_hub'

oslo_service/tests/test_service.py

@@ -164,8 +164,8 @@ class ServiceLauncherTest(ServiceTestBase):
         # Skip ps header
         f.readline()
 
-        processes = [tuple(int(p) for p in l.strip().split()[:2])
-                     for l in f]
+        processes = [tuple(int(p) for p in line.strip().split()[:2])
+                     for line in f]
         return [p for p, pp in processes if pp == self.pid]
 
     def test_killed_worker_recover(self):

releasenotes/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

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

test-requirements.txt

@@ -14,3 +14,5 @@ coverage!=4.4,>=4.0 # Apache-2.0
 
 # Bandit security code scanner
 bandit>=1.6.0,<1.7.0 # Apache-2.0
+
+pre-commit>=2.6.0 # MIT

tox.ini

 [tox]
 minversion = 3.2.0
-envlist = py38,pep8,bandit
+envlist = py3,pep8,bandit
 ignore_basepython_conflict = true
 
 [testenv]
@@ -10,7 +10,7 @@ setenv =
     BRANCH_NAME=master
     CLIENT_NAME=oslo.service
 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}/doc/requirements.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
@@ -21,7 +21,7 @@ commands =
 
 [testenv:pep8]
 commands =
-    flake8
+    pre-commit run -a
     bandit -r oslo_service -n5 -x tests
     doc8 --ignore-path "doc/source/history.rst" doc/source
 
@@ -54,7 +54,7 @@ commands = oslo_debug_helper -t oslo_service/tests {posargs}
 
 [testenv:bandit]
 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
   -r{toxinidir}/requirements.txt
 commands = bandit -r oslo_service -n5 -x tests {posargs}