summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-10-13 16:02:33 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-10-17 09:16:30 (GMT)
commit1fafceaa8e7f91aae684cf7c430f36faad4eec7b (patch)
tree3a143cf3324e93324dd7d1e58d08ef0f2216ee78
parentfa94e149f10cc9c66e9bf2f04601667db3d5e0d0 (diff)
downloaddefinitions-1fafceaa8e7f91aae684cf7c430f36faad4eec7b.tar.gz
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 <module> **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 <module> 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
-rw-r--r--strata/python2-core.morph4
-rw-r--r--strata/python3-core.morph4
2 files changed, 4 insertions, 4 deletions
diff --git a/strata/python2-core.morph b/strata/python2-core.morph
index aa6fe2e..2ae41d3 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 5bc491d..18bd5cc 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