From ccc0bfb3e636a96c4b165b7657db9edeaa096af9 Mon Sep 17 00:00:00 2001
From: Andrew Laski <andrew.laski@rackspace.com>
Date: Thu, 6 Sep 2012 21:21:23 -0400
Subject: 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
---
 nova/tests/test_libvirt_config.py | 6 +++---
 setup.py                          | 2 ++
 tools/pip-requires                | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/test_libvirt_config.py
index a00d5b572..b0da9f998 100644
--- a/nova/tests/test_libvirt_config.py
+++ b/nova/tests/test_libvirt_config.py
@@ -366,7 +366,7 @@ class LibvirtConfigGuestDiskTest(LibvirtConfigBaseTest):
         self.assertXmlEqual(xml, """
             <disk type="network" device="disk">
               <driver name="qemu" type="qcow2"/>
-              <source protocol="iscsi" name="foo.bar.com"/>
+              <source name="foo.bar.com" protocol="iscsi"/>
               <target bus="ide" dev="/dev/hda"/>
             </disk>""")
 
@@ -387,7 +387,7 @@ class LibvirtConfigGuestDiskTest(LibvirtConfigBaseTest):
         self.assertXmlEqual(xml, """
             <disk type="network" device="disk">
               <driver name="qemu" type="raw"/>
-              <source protocol="rbd" name="pool/image"/>
+              <source name="pool/image" protocol="rbd"/>
               <auth username="foo">
                 <secret type="ceph"
                 uuid="b38a3f43-4be2-4046-897f-b67c2f5e0147"/>
@@ -530,7 +530,7 @@ class LibvirtConfigGuestInterfaceTest(LibvirtConfigBaseTest):
             <interface type="direct">
               <mac address="DE:AD:BE:EF:CA:FE"/>
               <model type="virtio"/>
-              <source mode="private" dev="eth0"/>
+              <source dev="eth0" mode="private"/>
               <virtualport type="802.1Qbh"/>
             </interface>""")
 
diff --git a/setup.py b/setup.py
index 85bea96ea..5ae22d6a9 100644
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@ import setuptools
 from nova.openstack.common import setup as common_setup
 from nova import version
 
+requires = common_setup.parse_requirements()
 
 setuptools.setup(name='nova',
       version=version.canonical_version_string(),
@@ -32,6 +33,7 @@ setuptools.setup(name='nova',
       url='http://www.openstack.org/',
       cmdclass=common_setup.get_cmdclass(),
       packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
+      install_requires=requires,
       include_package_data=True,
       test_suite='nose.collector',
       setup_requires=['setuptools_git>=0.4'],
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
-- 
cgit