Use setuptools-git.

Change-Id: I6861a29d65b809362949f2c54197940fd0988785

diff --git a/MANIFEST.in b/MANIFEST.in
index a09323103c52c1c059cc66e3da0d0ef73ba803ee..c978a52dae21d475281a13590f71dc53aeb0945e 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,38 +1,6 @@
 include AUTHORS
-include HACKING.rst
-include LICENSE run_tests.sh
-include README.rst
-include MANIFEST.in pylintrc Authors
-include openstack-common.conf
-include babel.cfg tox.ini
-graft cinder/CA
-graft doc
-graft smoketests
-graft tools
-graft etc
-graft contrib
-graft plugins
-graft cinder/api/openstack/*/schemas
-include cinder/auth/*.schema
-include cinder/auth/cinderrc.template
-include cinder/auth/opendj.sh
-include cinder/auth/slap.sh
-include cinder/db/sqlalchemy/migrate_repo/migrate.cfg
-include cinder/db/sqlalchemy/migrate_repo/README
-include cinder/db/sqlalchemy/migrate_repo/versions/*.sql
-include cinder/openstack/common/README
-include cinder/virt/interfaces.template
-include cinder/virt/libvirt*.xml.template
-include cinder/virt/cpuinfo.xml.template
-include cinder/testing/README.rst
-include cinder/tests/db/cinder.austin.sqlite
-include cinder/tests/image/*.tar.gz
-include cinder/tests/policy.json
-include cinder/tests/test_migrations.conf
-include cinder/tests/xenapi/vm_rrd.xml
-include plugins/xenapi/README
-include plugins/xenapi/etc/xapi.d/plugins/objectstore
-include plugins/xenapi/etc/xapi.d/plugins/pluginlib_cinder.py
-global-exclude *.pyc
+include ChangeLog
+exclude .gitignore
+exclude .gitreview
 
-recursive-include cinder/locale *
+global-exclude *.pyc

diff --git a/setup.py b/setup.py
index 79c800c166450963f2516ec382a770074d09b27f..70adb594980ada9e9eac41d64e5c3885c0765b19 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,7 @@ setuptools.setup(name='cinder',
       packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
       include_package_data=True,
       test_suite='nose.collector',
+      setup_requires=['setuptools-git>=0.4'],
       scripts=['bin/clear_rabbit_queues',
                'bin/cinder-all',
                'bin/cinder-api',

diff --git a/tools/test-requires b/tools/test-requires
index 51ef2ff632c6961a3a3a28127d3fe6ecfd2998eb..4b8630e7ec861fa11ceb19caf1ce7eec02ad8de1 100644 (file)
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -9,3 +9,4 @@ openstack.nose_plugin
 pep8==1.1
 sphinx>=1.1.2
 MySQL-python
+setuptools-git>=0.4