feat: update python-pbr to 6.1.0-4

.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

.zuul.yaml

@@ -7,17 +7,14 @@
     required-projects:
       # TODO update this list with current active python projects
       - openstack/pbr
-      - openstack/tripleo-ci
       - openstack/aodh
       - openstack/automaton
       - openstack/ceilometer
       - openstack/ceilometermiddleware
       - openstack/cinder
       - openstack/cliff
       - openstack/debtcollector
-      - openstack/dib-utils
       - openstack/diskimage-builder
-      - openstack/django_openstack_auth
       - openstack/futurist
       - openstack/glance
       - openstack/glance_store
@@ -41,7 +38,6 @@
       - openstack/os-brick
       - openstack/os-client-config
       - openstack/os-collect-config
-      - openstack/os-net-config
       - openstack/os-refresh-config
       - openstack/osc-lib
       - openstack/oslo.cache
@@ -71,20 +67,15 @@
       - openstack/python-neutronclient
       - openstack/python-novaclient
       - openstack/python-openstackclient
-      - openstack/python-saharaclient
       - openstack/python-swiftclient
       - openstack/python-troveclient
       - openstack/python-zaqarclient
       - openstack/requirements
-      - openstack/sahara
-      - openstack/sahara-dashboard
       - openstack/stevedore
       - openstack/swift
       - openstack/taskflow
       - openstack/tempest
       - openstack/tooz
-      - openstack/tripleo-heat-templates
-      - openstack/tripleo-image-elements
       - openstack/trove
       - openstack/trove-dashboard
       - openstack/zaqar
@@ -107,28 +98,38 @@
 
 - project:
     templates:
-      - lib-forward-testing
       - lib-forward-testing-python3
-      - openstack-cover-jobs
-      - openstack-python-jobs
-      - openstack-python3-ussuri-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
     check:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-cover
+        - openstack-tox-py27
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
+        - openstack-tox-py310
+        - openstack-tox-py311
+        - openstack-tox-py312:
+            voting: false
         - pbr-installation-openstack
         - pbr-installation-openstack-pip-dev
-        - tempest-full:
-            override-checkout: stable/train
     gate:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-cover
+        - openstack-tox-py27
+        - openstack-tox-py36
+        - openstack-tox-py37
+        - openstack-tox-py38
+        - openstack-tox-py39
+        - openstack-tox-py310
+        - openstack-tox-py311
         - pbr-installation-openstack
         - pbr-installation-openstack-pip-dev
-        - tempest-full:
-            override-checkout: stable/train
     periodic:
       jobs:
         - pbr-installation-openstack
         - pbr-installation-openstack-pip-dev
-        - tempest-full:
-            override-checkout: stable/train

CONTRIBUTING.rst

@@ -9,6 +9,11 @@ the workflow documented at:
 
    https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow
 
+Release notes are managed through the tool
+`reno <https://pypi.org/project/reno/>`_. This tool will create
+a new file under the directory ``releasenotes`` that should
+be checked in with the code changes.
+
 Pull requests submitted through GitHub will be ignored.
 
 Bugs should be filed on Launchpad, not GitHub:

debian/changelog

@@ -1,3 +1,104 @@
+python-pbr (6.1.0-4) unstable; urgency=medium
+
+  * Switch to pybuild (Closes: #1090588).
+
+ -- Thomas Goirand <[email protected]>  Wed, 18 Dec 2024 23:49:30 +0100
+
+python-pbr (6.1.0-3) unstable; urgency=medium
+
+  * Removed runtime depends on python3-pkg-resources (Closes: #1083679).
+
+ -- Thomas Goirand <[email protected]>  Mon, 14 Oct 2024 11:29:41 +0200
+
+python-pbr (6.1.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <[email protected]>  Thu, 19 Sep 2024 17:30:15 +0200
+
+python-pbr (6.1.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <[email protected]>  Wed, 28 Aug 2024 11:05:47 +0200
+
+python-pbr (6.0.0-2) unstable; urgency=medium
+
+  * Removed extreneous build-dep on python3-mock (Closes: #1072293).
+
+ -- Thomas Goirand <[email protected]>  Sun, 02 Jun 2024 12:45:14 +0200
+
+python-pbr (6.0.0-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1060153).
+  * Do not use six anymore.
+  * Removed patches applied upstream:
+    - Replace-imp-with-importlib.machinery.patch
+    - remove_sphinx_doc_building_integration.patch
+
+ -- Thomas Goirand <[email protected]>  Tue, 20 Feb 2024 14:49:08 +0100
+
+python-pbr (5.11.1-5) unstable; urgency=medium
+
+  * Add Replace-imp-with-importlib.machinery.patch (Closes: #1058140).
+  * Cleans better.
+  * autopkgtest: blacklist TestPEP517Support.test_pep_517_support.
+
+ -- Thomas Goirand <[email protected]>  Tue, 12 Dec 2023 16:37:27 +0100
+
+python-pbr (5.11.1-4) unstable; urgency=medium
+
+  [ Dmitry Shachnev ]
+  * Backport upstream patch to remove Sphinx doc building integration
+    (closes: #1042668).
+
+ -- Thomas Goirand <[email protected]>  Sun, 05 Nov 2023 18:45:18 +0100
+
+python-pbr (5.11.1-3) unstable; urgency=medium
+
+  * Cleans better (Closes: #1045383).
+
+ -- Thomas Goirand <[email protected]>  Tue, 15 Aug 2023 11:29:34 +0200
+
+python-pbr (5.11.1-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <[email protected]>  Mon, 19 Jun 2023 11:15:25 +0200
+
+python-pbr (5.11.1-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <[email protected]>  Tue, 21 Feb 2023 14:30:07 +0100
+
+python-pbr (5.10.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+  * Blacklist test_wsgi_script_install() (no such file or directory).
+
+ -- Thomas Goirand <[email protected]>  Thu, 22 Sep 2022 16:53:18 +0200
+
+python-pbr (5.10.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <[email protected]>  Tue, 30 Aug 2022 11:51:55 +0200
+
+python-pbr (5.8.1-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <[email protected]>  Thu, 24 Mar 2022 11:50:40 +0100
+
+python-pbr (5.8.1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Better clean target.
+  * Blacklist test_pep_517_support() (not interesting for Debian anyways).
+
+ -- Thomas Goirand <[email protected]>  Tue, 15 Feb 2022 15:46:07 +0100
+
 python-pbr (5.6.0-2) unstable; urgency=medium
 
   * Uploading to unstable.

debian/control

@@ -19,10 +19,8 @@ Build-Depends-Indep:
  python3-coverage <!nocheck>,
  python3-fixtures <!nocheck>,
  python3-markupsafe <!nocheck>,
- python3-mock <!nocheck>,
  python3-openstackdocstheme <!nocheck>,
  python3-pip <!nocheck>,
- python3-six <!nocheck>,
  python3-sphinxcontrib.apidoc <!nodoc>,
  python3-stestr <!nocheck>,
  python3-testresources <!nocheck>,
@@ -75,9 +73,7 @@ Description: inject useful and sensible default behaviors into setuptools - doc
 Package: python3-pbr
 Architecture: all
 Depends:
- python3-pkg-resources,
  python3-setuptools,
- python3-six,
  ${misc:Depends},
  ${python3:Depends},
 Recommends:

debian/patches/do-not-use-six.patch

@@ -0,0 +1,88 @@
+Description: Do not use six
+Author: Thomas Goirand <[email protected]>
+Bug-Debian: https://bugs.debian.org/1060153
+Forwarded: no
+Last-Update: 2024-02-20
+
+--- python-pbr-6.0.0.orig/doc/requirements.txt
++++ python-pbr-6.0.0/doc/requirements.txt
+@@ -3,4 +3,3 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_ver
+ sphinxcontrib-apidoc>=0.2.0  # BSD
+ openstackdocstheme>=1.18.1 # Apache-2.0
+ reno>=2.5.0 # Apache-2.0
+-six==1.12.0 # MIT
+--- python-pbr-6.0.0.orig/pbr/sphinxext.py
++++ python-pbr-6.0.0/pbr/sphinxext.py
+@@ -15,7 +15,7 @@
+
+ import os.path
+
+-from six.moves import configparser
++import configparser
+ from sphinx.util import logging
+
+ import pbr.version
+--- python-pbr-6.0.0.orig/pbr/tests/test_packaging.py
++++ python-pbr-6.0.0/pbr/tests/test_packaging.py
+@@ -52,7 +52,6 @@ try:
+ except ImportError:
+     import mock
+ import pkg_resources
+-import six
+ import testscenarios
+ import testtools
+ from testtools import matchers
+@@ -218,18 +217,18 @@ class CreatePackages(fixtures.Fixture):
+     """
+
+     defaults = {
+-        'setup.py': textwrap.dedent(six.u("""\
++        'setup.py': textwrap.dedent("""\
+             #!/usr/bin/env python
+             import setuptools
+             setuptools.setup(
+                 setup_requires=['pbr'],
+                 pbr=True,
+             )
+-        """)),
+-        'setup.cfg': textwrap.dedent(six.u("""\
++        """),
++        'setup.cfg': textwrap.dedent("""\
+             [metadata]
+             name = {pkg_name}
+-        """))
++        """)
+     }
+
+     def __init__(self, packages):
+--- python-pbr-6.0.0.orig/pbr/tests/test_util.py
++++ python-pbr-6.0.0/pbr/tests/test_util.py
+@@ -17,8 +17,7 @@ import io
+ import tempfile
+ import textwrap
+
+-import six
+-from six.moves import configparser
++import configparser
+ import sys
+
+ from pbr.tests import base
+@@ -27,7 +26,7 @@ from pbr import util
+
+ def config_from_ini(ini):
+     config = {}
+-    ini = textwrap.dedent(six.u(ini))
++    ini = textwrap.dedent(str(ini))
+     if sys.version_info >= (3, 2):
+         parser = configparser.ConfigParser()
+         parser.read_file(io.StringIO(ini))
+--- python-pbr-6.0.0.orig/test-requirements.txt
++++ python-pbr-6.0.0/test-requirements.txt
+@@ -6,7 +6,6 @@ wheel>=0.32.0 # MIT
+ fixtures>=3.0.0 # Apache-2.0/BSD
+ hacking>=1.1.0,<4.0.0;python_version>='3.6' # Apache-2.0
+ mock>=2.0.0,<4.0.0;python_version=='2.7' # BSD
+-six>=1.12.0 # MIT
+ stestr>=2.1.0,<3.0;python_version=='2.7' # Apache-2.0
+ stestr>=2.1.0;python_version>='3.0' # Apache-2.0
+ testresources>=2.0.0 # Apache-2.0/BSD

debian/patches/series

@@ -1 +1,2 @@
 disable_tests.patch
+do-not-use-six.patch

debian/rules

@@ -7,10 +7,12 @@ export http_proxy=127.0.0.1:9
 export https_proxy=127.0.0.1:9
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
+	dh $@ --buildsystem=pybuild --with python3,sphinxdoc
 
 override_dh_auto_clean:
-	rm -rf .stestr build __pycache__
+	rm -rf .stestr build __pycache__ pbr.egg-info
+	find . -type d -name __pycache__ -exec rm -r {} \+
+	rm -rf doc/source/reference/api
 
 override_dh_auto_build:
 	echo "Do nothing..."
@@ -20,7 +22,7 @@ override_dh_auto_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	pkgos-dh_auto_test --no-py2 'pbr\.tests(?!.*test_packaging\.TestRequirementParsing\.test_requirement_parsing.*|.*test_core\.TestCore\.test_setup_py_keywords.*)'
+	pkgos-dh_auto_test --no-py2 'pbr\.tests(?!.*test_packaging\.TestRequirementParsing\.test_requirement_parsing.*|.*test_core\.TestCore\.test_setup_py_keywords.*|.*test_packaging\.TestPEP517Support\.test_pep_517_support.*|.*test_wsgi\.TestWsgiScripts\.test_wsgi_script_install.*)'
 endif
 
 override_dh_sphinxdoc:

debian/tests/unit

@@ -2,4 +2,4 @@
 
 set -e
 
-pkgos-dh_auto_test --no-py2 'pbr\.tests(?!.*test_packaging\.TestRequirementParsing\.test_requirement_parsing.*)'
+pkgos-dh_auto_test --no-py2 'pbr\.tests(?!.*test_packaging\.TestRequirementParsing\.test_requirement_parsing.*|.*test_wsgi\.TestWsgiScripts\.test_wsgi_script_install.*|.*test_packaging\.TestPEP517Support\.test_pep_517_support.*)'