Imported Upstream version 5.5.1

diff --git a/.zuul.yaml b/.zuul.yaml
index a4156aaaf31e7e480b50d573f0b4d50861dc9348..ba9b3fa01a2ae4fb3324097e2e527ff81b688fd6 100644 (file)
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -119,11 +119,17 @@
       jobs:
         - pbr-installation-openstack
         - pbr-installation-openstack-pip-dev
+        - tempest-full:
+            override-checkout: stable/train
     gate:
       jobs:
         - 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

diff --git a/ChangeLog b/ChangeLog
index 0e1da47590af1ac704c213f63bf6f21d96122e04..170a1fadc57774c123155b3fa85637e88292c67a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+5.5.1
+-----
+
+* Run tempest-full for stable/train
+* Remove use\_2to3 backward compat for Setuptools
+* More easy\_install.ScriptWriter.get\_header()
+
 5.5.0
 -----
 

diff --git a/PKG-INFO b/PKG-INFO
index 554c233c7a0c2c6d8605cd707c030fedc12eff04..7df18044f8a3c899aa0127b06bcb83d94d4de34f 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 5.5.0
+Version: 5.5.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/pbr.egg-info/PKG-INFO b/pbr.egg-info/PKG-INFO
index 554c233c7a0c2c6d8605cd707c030fedc12eff04..7df18044f8a3c899aa0127b06bcb83d94d4de34f 100644 (file)
--- a/pbr.egg-info/PKG-INFO
+++ b/pbr.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pbr
-Version: 5.5.0
+Version: 5.5.1
 Summary: Python Build Reasonableness
 Home-page: https://docs.openstack.org/pbr/latest/
 Author: OpenStack

diff --git a/pbr.egg-info/SOURCES.txt b/pbr.egg-info/SOURCES.txt
index 46ba38e6515e372685e2d1daa485c781932ec477..779cbf3af4ee997f46f2bce6ece183fc666a92e1 100644 (file)
--- a/pbr.egg-info/SOURCES.txt
+++ b/pbr.egg-info/SOURCES.txt
@@ -104,6 +104,7 @@ releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml
 releasenotes/notes/long-descr-content-type-f9a1003acbb8740f.yaml
 releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml
 releasenotes/notes/support-vcs-uris-with-subdirectories-20ad68b6138f72ca.yaml
+releasenotes/notes/use_2to3-removal-ac48bf9fbfa049b1.yaml
 releasenotes/notes/v_version-457b38c8679c5868.yaml
 releasenotes/source/conf.py
 releasenotes/source/index.rst

diff --git a/pbr/packaging.py b/pbr/packaging.py
index 90b9933b14e4f155db83d24da028eb35d1c22071..ae0779653cc6d17bf005cf07221ac9e0b6f786bb 100644 (file)
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -433,7 +433,11 @@ def generate_script(group, entry_point, header, template):
 def override_get_script_args(
         dist, executable=os.path.normpath(sys.executable)):
     """Override entrypoints console_script."""
-    header = easy_install.get_script_header("", executable)
+    # get_script_header() is deprecated since Setuptools 12.0
+    try:
+        header = easy_install.ScriptWriter.get_header("", executable)
+    except AttributeError:
+        header = easy_install.get_script_header("", executable)
     for group, template in ENTRY_POINTS_MAP.items():
         for name, ep in dist.get_entry_map(group).items():
             yield (name, generate_script(group, ep, header, template))

diff --git a/pbr/util.py b/pbr/util.py
index 89f5088b666b0c643eede63197c7c0c0fa7aa304..6e8d23148e1fb596b8520521a20143c631672e94 100644 (file)
--- a/pbr/util.py
+++ b/pbr/util.py
@@ -128,7 +128,6 @@ D1_D2_SETUP_ARGS = {
     "cmdclass": ("global", "commands"),
     # Not supported in distutils2, but provided for
     # backwards compatibility with setuptools
-    "use_2to3": ("backwards_compat", "use_2to3"),
     "zip_safe": ("backwards_compat", "zip_safe"),
     "tests_require": ("backwards_compat", "tests_require"),
     "dependency_links": ("backwards_compat",),
@@ -158,7 +157,7 @@ MULTI_FIELDS = ("classifiers",
 MAP_FIELDS = ("project_urls",)
 
 # setup() arguments that contain boolean values
-BOOL_FIELDS = ("use_2to3", "zip_safe", "include_package_data")
+BOOL_FIELDS = ("zip_safe", "include_package_data")
 
 CSV_FIELDS = ()
 

diff --git a/releasenotes/notes/use_2to3-removal-ac48bf9fbfa049b1.yaml b/releasenotes/notes/use_2to3-removal-ac48bf9fbfa049b1.yaml
new file mode 100644 (file)
index 0000000..e0e34ca
--- /dev/null
+++ b/releasenotes/notes/use_2to3-removal-ac48bf9fbfa049b1.yaml
@@ -0,0 +1,9 @@
+---
+other:
+  - |
+    The 2to3 conversion utility has been long discouraged in favor of writing
+    multi-version-capable scripts. As of Setuptools 46.2.0 it's deprecated and
+    slated for removal from the Python 3.10 standard library. Projects which
+    still need it are encouraged to perform conversion prior to packaging. See
+    https://bugs.python.org/issue40360 and
+    https://github.com/pypa/setuptools/issues/2086 for more details.