From 1fafceaa8e7f91aae684cf7c430f36faad4eec7b Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 13 Oct 2016 16:02:33 +0000 Subject: Upgrade pbr to 0.11.1 to fix build error in python3-core + python3 setup.py install --prefix /usr --root /pbr.inst Traceback (most recent call last): File "setup.py", line 22, in **util.cfg_to_args()) File "/pbr.build/pbr/util.py", line 256, in cfg_to_args wrap_commands(kwargs) File "/pbr.build/pbr/util.py", line 477, in wrap_commands for cmd, _ in dist.get_command_list(): File "/usr/lib/python3.5/site-packages/setuptools/dist.py", line 447, in get_command_list cmdclass = ep.resolve() File "/usr/lib/python3.5/site-packages/pkg_resources/__init__.py", line 2235, in resolve module = __import__(self.module_name, fromlist=['__name__'], level=0) File "/pbr.build/pbr/testr_command.py", line 47, in from testrepository import commands ImportError: No module named 'testrepository' Upgraded also pbr in python2-core for consistency, and not upgraded to latest given that some components (like mox3) need pbr's version to be < 1 Change-Id: I42c278c95e001729ab0b458097301a4be42d3d85 --- strata/python2-core.morph | 4 ++-- strata/python3-core.morph | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/python2-core.morph b/strata/python2-core.morph index aa6fe2e5..2ae41d34 100644 --- a/strata/python2-core.morph +++ b/strata/python2-core.morph @@ -32,8 +32,8 @@ chunks: - name: pbr-python2 repo: upstream:pbr - ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 - unpetrify-ref: 0.10.7 + ref: 6e472b4905411a39e993c81c382a27ca9c771ef5 + unpetrify-ref: 0.11.1 build-system: python-distutils build-depends: - python2 diff --git a/strata/python3-core.morph b/strata/python3-core.morph index 5bc491dd..18bd5cc6 100644 --- a/strata/python3-core.morph +++ b/strata/python3-core.morph @@ -17,8 +17,8 @@ chunks: - name: pbr repo: upstream:pbr - ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 - unpetrify-ref: 0.10.7 + ref: 6e472b4905411a39e993c81c382a27ca9c771ef5 + unpetrify-ref: 0.11.1 build-system: python3-distutils - name: python-requests -- cgit v1.2.1