summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml6
-rw-r--r--pbr/packaging.py6
2 files changed, 11 insertions, 1 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index a4156aa..ba9b3fa 100644
--- 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/pbr/packaging.py b/pbr/packaging.py
index 90b9933..ae07796 100644
--- 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))