summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-04-08 13:39:51 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-04-08 13:39:51 +0000
commit37462751db523a2c1120b3bf1cdfbb981c4cb2a0 (patch)
tree0a5429925f6d958f1013a9f8838dc29855ccf6ce
parent7eee9fc8ac2ee1f3ed4cb6390875087737378c19 (diff)
downloadceilometer-37462751db523a2c1120b3bf1cdfbb981c4cb2a0.tar.gz
Updated from global requirements
Change-Id: Ib0bc46203bf8e4d0434e488fc7ac4c25dde25130
-rw-r--r--requirements-py3.txt2
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements-py3.txt14
-rw-r--r--test-requirements.txt14
4 files changed, 16 insertions, 16 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt
index 0ffc8ea6..d59f0a91 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -31,7 +31,7 @@ python-novaclient>=2.18.0,<=2.20.0
python-swiftclient>=2.2.0,<=2.3.1
pytz<=2014.10
PyYAML>=3.1.0,<=3.10
-requests>=1.2.1,!=2.4.0,<=2.2.1
+requests>=2.1.0,!=2.4.0,<=2.2.1
six>=1.7.0,<=1.9.0
SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
sqlalchemy-migrate==0.9.1
diff --git a/requirements.txt b/requirements.txt
index 758818ef..16c70f50 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,7 +37,7 @@ python-novaclient>=2.18.0,<=2.20.0
python-swiftclient>=2.2.0,<=2.3.1
pytz<=2014.10
PyYAML>=3.1.0,<=3.10
-requests>=1.2.1,!=2.4.0,<=2.2.1
+requests>=2.1.0,!=2.4.0,<=2.2.1
six>=1.7.0,<=1.9.0
SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
sqlalchemy-migrate==0.9.1
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index 6fbca0cc..633eb23f 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -6,20 +6,20 @@
hacking>=0.9.2,<0.10
Babel>=1.3,<=1.3
coverage>=3.6,<=3.7.1
-discover
+discover<=0.4.0
fixtures>=0.3.14,<=1.0.0
httplib2>=0.7.5,<=0.9
-mock>=1.0
+mock>=1.0,<=1.0.1
mox>=0.5.3,<=0.5.3
# Docs Requirements
oslosphinx>=2.2.0,<2.5.0 # Apache-2.0
oslotest>=1.1.0,<1.4.0 # Apache-2.0
-pymongo>=2.5
+pymongo>=2.5,<3.0
python-subunit>=0.0.18,<=1.0.0
sphinx>=1.1.2,!=1.2.0,<1.3
-sphinxcontrib-docbookrestapi
-sphinxcontrib-httpdomain
-sphinxcontrib-pecanwsme>=0.8
+sphinxcontrib-docbookrestapi<=0.2.1
+sphinxcontrib-httpdomain<=1.3.0
+sphinxcontrib-pecanwsme>=0.8,<=0.8.0
testrepository>=0.0.18,<=0.0.20
-testscenarios>=0.4
+testscenarios>=0.4,<=0.4
testtools>=0.9.34,!=1.4.0,<=1.5.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 29a009c5..7f54ca08 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,21 +6,21 @@
hacking>=0.9.2,<0.10
Babel>=1.3,<=1.3
coverage>=3.6,<=3.7.1
-discover
+discover<=0.4.0
fixtures>=0.3.14,<=1.0.0
httplib2>=0.7.5,<=0.9
-mock>=1.0
+mock>=1.0,<=1.0.1
mox>=0.5.3,<=0.5.3
MySQL-python<=1.2.3
# Docs Requirements
oslosphinx>=2.2.0,<2.5.0 # Apache-2.0
oslotest>=1.1.0,<1.4.0 # Apache-2.0
-pymongo>=2.5
+pymongo>=2.5,<3.0
python-subunit>=0.0.18,<=1.0.0
sphinx>=1.1.2,!=1.2.0,<1.3
-sphinxcontrib-docbookrestapi
-sphinxcontrib-httpdomain
-sphinxcontrib-pecanwsme>=0.8
+sphinxcontrib-docbookrestapi<=0.2.1
+sphinxcontrib-httpdomain<=1.3.0
+sphinxcontrib-pecanwsme>=0.8,<=0.8.0
testrepository>=0.0.18,<=0.0.20
-testscenarios>=0.4
+testscenarios>=0.4,<=0.4
testtools>=0.9.34,!=1.4.0,<=1.5.0