summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-04-09 21:40:35 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-04-09 21:40:35 +0000
commit1bc324827b6a69b27617f9a4aaf0deb4ff65961a (patch)
treeab06006a529fa35242f4ee90c4dd1f47a4cd6d0e
parentfda2234c9a5f660d4a09fa361a17e86269d475b6 (diff)
downloadironic-1bc324827b6a69b27617f9a4aaf0deb4ff65961a.tar.gz
Updated from global requirements
Change-Id: I2152b16fc80099873d2d7709b68d2b738d424892
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt
index 024d0eb22..6ad153781 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,7 @@ sqlalchemy-migrate==0.9.1
netaddr>=0.7.12,<=0.7.13
paramiko>=1.13.0,<=1.15.2
iso8601>=0.1.9,<=0.1.10
-python-neutronclient>=2.3.6,<3
+python-neutronclient>=2.3.6,<2.4.0
python-glanceclient>=0.14.0,<=0.15.0
python-keystoneclient>=0.10.0,<=1.1.0
python-swiftclient>=2.2.0,<=2.3.1
diff --git a/test-requirements.txt b/test-requirements.txt
index 80d1e3c50..ad11ab84f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,13 +3,13 @@
# process, which may cause wedges in the gate later.
hacking>=0.9.2,<0.10
coverage>=3.6,<=3.7.1
-discover
+discover<=0.4.0
fixtures>=0.3.14,<=1.0.0
-mock>=1.0
+mock>=1.0,<=1.0.1
Babel>=1.3,<=1.3
MySQL-python<=1.2.3
oslotest>=1.1.0,<1.4.0 # Apache-2.0
-psycopg2
+psycopg2<=2.6
python-ironicclient>=0.2.1,<=0.3.3
python-subunit>=0.0.18,<=1.0.0
testrepository>=0.0.18,<=0.0.20
@@ -17,6 +17,6 @@ testtools>=0.9.34,!=1.4.0,<=1.5.0
# Doc requirements
sphinx>=1.1.2,!=1.2.0,<1.3
-sphinxcontrib-pecanwsme>=0.8
+sphinxcontrib-pecanwsme>=0.8,<=0.8.0
oslosphinx>=2.2.0,<2.5.0 # Apache-2.0