aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2017-01-10 09:44:01 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2017-01-10 09:44:01 +0000
commit216aa0d4dbe24e49414e1cff7d565963dfee73b3 (patch)
treea8db43ae7e6cc8337f7e40453f23b56f48acb8bd
parent8f02a77ad4d3a157702603818b7548f2a98fc9d0 (diff)
Updated from global requirements
Change-Id: I9ae60dfb2ef5e8fb5aae482ddb08206fc1980ca5
-rw-r--r--requirements.txt5
-rw-r--r--setup.py11
-rw-r--r--test-requirements.txt5
3 files changed, 17 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt
index 9c4a708..3f15762 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,5 @@
-pbr>=0.5.21,<1.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pbr>=1.8 # Apache-2.0
Jinja2>=2.8 # BSD License (3 clause)
diff --git a/setup.py b/setup.py
index 70c2b3f..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,14 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+ import multiprocessing # noqa
+except ImportError:
+ pass
+
setuptools.setup(
- setup_requires=['pbr'],
+ setup_requires=['pbr>=1.8'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index c3726e8..6489b16 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1,4 @@
-pyyaml
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+PyYAML>=3.10.0 # MIT