summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--requirements-py3.txt38
-rw-r--r--requirements.txt40
-rw-r--r--setup.py1
-rw-r--r--test-requirements-py3.txt8
-rw-r--r--test-requirements.txt10
5 files changed, 48 insertions, 49 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt
index 3b87ac22b..3a0a24441 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -2,10 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
Babel>=1.3
dogpile.cache>=0.5.3
-eventlet>=0.17.3
+eventlet>=0.17.4
greenlet>=0.3.2
httplib2>=0.7.5
iso8601>=0.1.9
@@ -13,36 +13,36 @@ keystonemiddleware>=1.5.0
kombu>=3.0.7
lxml>=2.3
netaddr>=0.7.12
-oslo.config>=1.11.0 # Apache-2.0
-oslo.concurrency>=2.0.0 # Apache-2.0
-oslo.context>=0.2.0 # Apache-2.0
-oslo.db>=1.10.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=1.2.0 # Apache-2.0
-oslo.messaging>=1.8.0 # Apache-2.0
-oslo.middleware>=1.2.0,!=2.0.0 # Apache-2.0
-oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=1.6.0 # Apache-2.0
-osprofiler>=0.3.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.concurrency>=2.0.0 # Apache-2.0
+oslo.context>=0.2.0 # Apache-2.0
+oslo.db>=1.10.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+osprofiler>=0.3.0 # Apache-2.0
oslo.versionedobjects>=0.3.0
PasteDeploy>=1.5.0
-posix_ipc
+posix-ipc
pycrypto>=2.6
python-ceilometerclient>=1.0.13
python-cinderclient>=1.2.2
python-glanceclient>=0.18.0
python-heatclient>=0.3.0
python-keystoneclient>=1.6.0
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
python-novaclient>=2.22.0
python-saharaclient>=0.9.0
python-swiftclient>=2.2.0
-python-troveclient>=1.0.7
+python-troveclient>=1.0.9
PyYAML>=3.1.0
requests>=2.5.2
-Routes>=1.12.3,!=2.0
+Routes!=2.0,>=1.12.3
six>=1.9.0
-SQLAlchemy>=0.9.7,<1.1.0
+SQLAlchemy<1.1.0,>=0.9.7
sqlalchemy-migrate>=0.9.6
-stevedore>=1.5.0 # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
WebOb>=1.2.3
diff --git a/requirements.txt b/requirements.txt
index 68baf276e..3a85c2ba8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
Babel>=1.3
dogpile.cache>=0.5.3
-eventlet>=0.17.3
+eventlet>=0.17.4
greenlet>=0.3.2
httplib2>=0.7.5
iso8601>=0.1.9
@@ -13,21 +13,21 @@ keystonemiddleware>=1.5.0
kombu>=3.0.7
lxml>=2.3
netaddr>=0.7.12
-oslo.config>=1.11.0 # Apache-2.0
-oslo.concurrency>=2.0.0 # Apache-2.0
-oslo.context>=0.2.0 # Apache-2.0
-oslo.db>=1.10.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=1.2.0 # Apache-2.0
-oslo.messaging>=1.8.0 # Apache-2.0
-oslo.middleware>=1.2.0,!=2.0.0 # Apache-2.0
-oslo.policy>=0.5.0 # Apache-2.0
-oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=1.6.0 # Apache-2.0
-osprofiler>=0.3.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.concurrency>=2.0.0 # Apache-2.0
+oslo.context>=0.2.0 # Apache-2.0
+oslo.db>=1.10.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+osprofiler>=0.3.0 # Apache-2.0
oslo.versionedobjects>=0.3.0
PasteDeploy>=1.5.0
-posix_ipc
+posix-ipc
pycrypto>=2.6
python-barbicanclient>=3.0.1
python-ceilometerclient>=1.0.13
@@ -37,18 +37,18 @@ python-glanceclient>=0.18.0
python-heatclient>=0.3.0
python-keystoneclient>=1.6.0
python-manilaclient>=1.0.4
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
python-novaclient>=2.22.0
python-saharaclient>=0.9.0
python-swiftclient>=2.2.0
-python-troveclient>=1.0.7
+python-troveclient>=1.0.9
python-zaqarclient>=0.1.1
PyYAML>=3.1.0
qpid-python
requests>=2.5.2
-Routes>=1.12.3,!=2.0
+Routes!=2.0,>=1.12.3
six>=1.9.0
-SQLAlchemy>=0.9.7,<1.1.0
+SQLAlchemy<1.1.0,>=0.9.7
sqlalchemy-migrate>=0.9.6
-stevedore>=1.5.0 # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
WebOb>=1.2.3
diff --git a/setup.py b/setup.py
index 736375744..056c16c2b 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");
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index fac1aacad..60b8eabf0 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -8,11 +8,11 @@ coverage>=3.6
discover
mock>=1.0
mox>=0.5.3
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
paramiko>=1.13.0
psycopg2
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+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
diff --git a/test-requirements.txt b/test-requirements.txt
index fd2d78ebd..0aaf7ce77 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,12 +8,12 @@ coverage>=3.6
discover
mock>=1.0
mox>=0.5.3
-PyMySQL>=0.6.2 # MIT License
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
+PyMySQL>=0.6.2 # MIT License
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
paramiko>=1.13.0
psycopg2
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+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