diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-09 05:07:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-09 05:07:11 +0000 |
| commit | 3eb982f447e899661061959b7d9bb95cd8e09532 (patch) | |
| tree | 9a7da546e326642f8a05c0e1e2a330ad2eab4490 | |
| parent | d5521e4b2097e2335e860184e34653568d532aa9 (diff) | |
| parent | ccc0bfb3e636a96c4b165b7657db9edeaa096af9 (diff) | |
Merge "Set install_requires in setup.py."
| -rw-r--r-- | nova/tests/test_libvirt_config.py | 6 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | 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>""") @@ -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 |