summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJeremy Stanley <fungi@yuggoth.org>2013-05-21 00:28:24 +0000
committerJeremy Stanley <fungi@yuggoth.org>2013-05-21 00:33:35 +0000
commitc39687edb9138c6eac675b8781a5d4bf5a51c968 (patch)
tree886db1429ee5113793facfced1587ed6cdcc111b /tools
parenteebcd6f2058d78c87dd2ee0a9a90f21f33f44e97 (diff)
downloadnova-c39687edb9138c6eac675b8781a5d4bf5a51c968.tar.gz
nova-c39687edb9138c6eac675b8781a5d4bf5a51c968.tar.xz
nova-c39687edb9138c6eac675b8781a5d4bf5a51c968.zip
Add requests requirement capped <1.2.1.
Fixes bug 1182271. * tools/pip-requires: The requests library released 1.2.1 today which brings in sphinx as a new dependency. One of sphinx's transitive dependencies is on a newer version of jinja than is provided in the python-jinja2 package on CentOS 6, and since nova's unit tests allow site-packages in the venv for libvirt support this cap is needed so that gate-nova-python26 will continue to work. Because requests is actually a dependency of python-cinderclient but is only breaking nova's unit tests, it has to be added and come before python-cinderclient in the pip-requires list. A separate change has been proposed to openstack/requirements which will need to merge first. https://review.openstack.org/29850 Change-Id: Ia198192d6231f71272d3aa4f5942828a45d86ceb
Diffstat (limited to 'tools')
-rw-r--r--tools/pip-requires1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/pip-requires b/tools/pip-requires
index d9fbd1b67..7db3a2a0b 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -22,6 +22,7 @@ pyasn1
Babel>=0.9.6
iso8601>=0.1.4
httplib2
+requests>=1.1,<1.2.1 # order-dependent python-cinderclient req cap, bug 1182271
python-cinderclient>=1.0.1
python-quantumclient>=2.2.0,<3.0.0
python-glanceclient>=0.5.0,<2