summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-11-13 17:11:37 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-11-13 17:11:37 +0000
commit6ebfd525f67181ed48454cea99491eb4303a20eb (patch)
tree6411c072da808912a270ad8f29c3f4e6875a241f
parent84b6f7edc47e4f454f13e3055ab8611ccafa2544 (diff)
downloadkolla-6ebfd525f67181ed48454cea99491eb4303a20eb.tar.gz
kolla-6ebfd525f67181ed48454cea99491eb4303a20eb.zip
Updated from global requirements
Change-Id: Ibe06fcece3a098781f8b55437727617b2727509f
-rw-r--r--[-rwxr-xr-x]requirements.txt9
-rw-r--r--setup.py2
-rw-r--r--test-requirements.txt27
3 files changed, 22 insertions, 16 deletions
diff --git a/requirements.txt b/requirements.txt
index 450c7b147..faa1f2e34 100755..100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,8 @@
-pbr<2.0,>=1.6
-docker-py>=1.1.0 # Apache-2.0
-Jinja2>=2.6 # BSD License (3 clause)
+# 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.6
+docker-py>=1.4.0 # Apache-2.0
+Jinja2>=2.6 # BSD License (3 clause)
gitdb>=0.6.4 # BSD License (3 clause)
GitPython>=1.0.1 # BSD License (3 clause)
diff --git a/setup.py b/setup.py
index d8080d05c..782bb21f0 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
- setup_requires=['pbr>=1.3'],
+ setup_requires=['pbr>=1.8'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index e42b9d352..6a0320b4c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,18 +1,21 @@
+# 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.
hacking>=0.10.0
-oslo.log>=1.0.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
+oslo.log>=1.12.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
oslosphinx>=2.5.0 # Apache-2.0
-PyYAML
-python-barbicanclient>=3.0.1
-python-ceilometerclient>=1.0.6
-python-cinderclient>=1.1.0
-python-glanceclient>=0.15.0
-python-heatclient>=0.3.0
-python-keystoneclient>=1.1.0
-python-neutronclient>=2.3.11,<3
-python-novaclient>=2.18.0,!=2.21.0
+PyYAML>=3.1.0
+python-barbicanclient>=3.3.0
+python-ceilometerclient>=1.5.0
+python-cinderclient>=1.3.1
+python-glanceclient>=0.18.0
+python-heatclient>=0.6.0
+python-keystoneclient!=1.8.0,>=1.6.0
+python-neutronclient>=2.6.0
+python-novaclient!=2.33.0,>=2.29.0
python-swiftclient>=2.2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
testrepository>=0.0.18
testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0