summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2014-07-24 16:46:50 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2014-07-24 16:46:50 +0000
commit6ad196a221aa50b3a3657fe17c02150e947e7ae0 (patch)
treef7e8467b3ff474eb7dc58744f634805680922eec
parentb534ff5271e1221fdd4258d56dc15d76a498f008 (diff)
downloadheat-6ad196a221aa50b3a3657fe17c02150e947e7ae0.tar.gz
Updated from global requirements
Change-Id: Ib84db5aaf53e8f44efde0ae400ac6fa4187f27df
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt
index 4b6298d53..1adc1365b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,8 +13,8 @@ sqlalchemy-migrate>=0.8.2,!=0.8.4
python-novaclient>=2.17.0
PasteDeploy>=1.5.0
requests>=1.1
-Routes>=1.12.3
-SQLAlchemy>=0.7.8,<=0.9.99
+Routes>=1.12.3,!=2.0
+SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
WebOb>=1.2.3
python-heatclient>=0.2.3
python-keystoneclient>=0.7.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f8aab6837..1faa43fce 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,6 +9,6 @@ testtools>=0.9.34
testrepository>=0.0.18
testscenarios>=0.4
python-glanceclient>=0.9.0
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,<1.1.999
oslosphinx
lockfile>=0.8