openstack/cinder
Code Issues Proposed changes

Add missing entries in setup, fix up pip-requires

Browse Source 
setup.py still has references to nova/compute and was missing some
requires statements, and more importantly didn't hvae the install_requires.

Also, tools/pip-requires needed lxml versions set, as well as
added the missing setuptools_git entry.

This was exposed when trying to run Grenade as the requires.txt
file was never generated.

Fixes bug #1055693

Change-Id: Iaf9669d66e89507989ef3fde630dc2b488a97cfc
This commit is contained in:
John Griffith
2012-09-24 12:59:15 -06:00
parent 0f0a90ca0d
commit 7f00d13640
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup.py
View File

@@ -21,17 +21,20 @@ import setuptools
from cinder.openstack.common import setup as common_setup
from cinder import version
requires = common_setup.parse_requirements()
setuptools.setup(name='cinder',
version=version.canonical_version_string(),
description='cloud computing fabric controller',
description='block storage service',
author='OpenStack',
author_email='cinder@lists.launchpad.net',
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'],
setup_requires=['setuptools_git>=0.4'],
scripts=['bin/cinder-all',
'bin/cinder-api',
'bin/cinder-clear-rabbit-queues',
@@ -39,5 +42,6 @@ setuptools.setup(name='cinder',
'bin/cinder-rootwrap',
'bin/cinder-scheduler',
'bin/cinder-volume',
'bin/cinder-volume-usage-audit'],
'bin/cinder-volume-usage-audit',
],
py_modules=[])