x/gantt
Code Issues Proposed changes

Set install_requires in setup.py.

Browse Source 
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
This commit is contained in:
Andrew Laski 2012-09-06 21:21:23 -04:00
parent 07a5196ccb
commit c978fbc3a5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/test_libvirt_config.py
View File

@ -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>""")

2
setup.py
View File

@ -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'],