summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndrew Laski <andrew.laski@rackspace.com>2012-09-06 21:21:23 -0400
committerAndrew Laski <andrew.laski@rackspace.com>2012-09-07 17:47:24 -0400
commitccc0bfb3e636a96c4b165b7657db9edeaa096af9 (patch)
tree83449e77aee32fe36bf3456459fc6b36f817f0c4 /tools
parent37cc45b8fdaa199b248a7ef5f683d514733b8387 (diff)
downloadnova-ccc0bfb3e636a96c4b165b7657db9edeaa096af9.tar.gz
nova-ccc0bfb3e636a96c4b165b7657db9edeaa096af9.tar.xz
nova-ccc0bfb3e636a96c4b165b7657db9edeaa096af9.zip
Set install_requires in setup.py.
Updates setup.py to set install_requires using parse_requirements from openstack-common. This allows DevStack to install nova requirements, as currently they are not handled. Also relaxes the version requirement for lxml to >=2.3,<3. This allows DevStack to install nova requirements without needing to install lxml over the installed python-xml system package, currently 2.3.2. Change-Id: Iccebf9604ba5c6fcacb4c5fa5004f9fcb08944f3
Diffstat (limited to 'tools')
-rw-r--r--tools/pip-requires2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/pip-requires b/tools/pip-requires
index dea5eaa3c..0688522cd 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -5,7 +5,7 @@ anyjson==0.2.4
boto==2.1.1
eventlet>=0.9.17
kombu==1.0.4
-lxml==2.3
+lxml>=2.3,<3
routes==1.12.3
WebOb==1.0.8
greenlet>=0.3.1