diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/test_libvirt_config.py index a00d5b572818..b0da9f99875c 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, """ - + """) @@ -387,7 +387,7 @@ class LibvirtConfigGuestDiskTest(LibvirtConfigBaseTest): self.assertXmlEqual(xml, """ - + @@ -530,7 +530,7 @@ class LibvirtConfigGuestInterfaceTest(LibvirtConfigBaseTest): - + """) diff --git a/setup.py b/setup.py index 85bea96eacdb..5ae22d6a9314 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 dea5eaa3cc49..0688522cd391 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

AltStyle によって変換されたページ (->オリジナル) /