Use setuptools git plugin for file inclusion.

Fixes bug 1018833. We're looking at this as a possible pan-project
option instead of manual MANIFEST.in inclusion and then looking for
where the tarballs differ.

Change-Id: I25287d5aca2046c6b613b05d54281533bdd6f79f
This commit is contained in:
Monty Taylor 2012-06-28 07:45:35 -07:00
parent 4ac3207927
commit 6d9ddf1c37
4 changed files with 13 additions and 30 deletions

View File

@ -1,29 +1,7 @@
include HACKING.rst include AUTHORS
include README LICENSE TESTING AUTHORS include ChangeLog
include run_tests.py run_tests.sh
include .pylintrc exclude .gitignore
include openstack-common.conf exclude .gitreview
include bin/*
graft doc/* global-exclude *.pyc
include doc/Makefile doc/pom.xml
include etc/*
include etc/init.d/*
include etc/quantum/plugins/openvswitch/*.ini
include etc/quantum/plugins/cisco/*.ini
include etc/quantum/plugins/cisco/quantum.conf.ciscoext
include etc/quantum/plugins/linuxbridge/*.ini
include etc/quantum/plugins/nicira/*
include etc/quantum/plugins/ryu/*.ini
include quantum/plugins/*/README
include quantum/plugins/cisco/services/README
include quantum/plugins/nicira/nicira_nvp_plugin/*
include quantum/plugins/nicira/nicira_nvp_plugin/tests/*
include quantum/plugins/openvswitch/Makefile
include quantum/plugins/openvswitch/tests/unit/*.txt
include quantum/plugins/openvswitch/agent/xenserver_install.sh
include tools/build_debs.sh
include tools/clean.sh
include tools/pip-requires tools/test-requires
include tools/rfc.sh
include tools/with_venv.sh
include tox.ini

View File

@ -82,6 +82,7 @@ setuptools.setup(
install_requires=requires, install_requires=requires,
dependency_links=depend_links, dependency_links=depend_links,
include_package_data=False, include_package_data=False,
setup_requires=['setuptools_git>=0.4'],
packages=setuptools.find_packages('.'), packages=setuptools.find_packages('.'),
cmdclass=setup.get_cmdclass(), cmdclass=setup.get_cmdclass(),
data_files=DataFiles, data_files=DataFiles,

View File

@ -97,6 +97,8 @@ def install_dependencies(venv=VENV):
PIP_REQUIRES], redirect_output=False) PIP_REQUIRES], redirect_output=False)
run_command(['tools/with_venv.sh', 'pip', 'install', '-r', run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
TEST_REQUIRES], redirect_output=False) TEST_REQUIRES], redirect_output=False)
run_command(['tools/with_venv.sh', 'pip', 'install',
'setuptools_git>=0.4'], redirect_output=False)
# Tell the virtual env how to "import quantum" # Tell the virtual env how to "import quantum"
pthfile = os.path.join(venv, "lib", PY_VERSION, "site-packages", pthfile = os.path.join(venv, "lib", PY_VERSION, "site-packages",

View File

@ -11,6 +11,7 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_STDOUT=1 NOSE_OPENSTACK_STDOUT=1
deps = -r{toxinidir}/tools/pip-requires deps = -r{toxinidir}/tools/pip-requires
-r{toxinidir}/tools/test-requires -r{toxinidir}/tools/test-requires
setuptools_git>=0.4
commands = nosetests {posargs} commands = nosetests {posargs}
[tox:jenkins] [tox:jenkins]
@ -19,7 +20,8 @@ downloadcache = ~/cache/pip
[testenv:pep8] [testenv:pep8]
deps = pep8 deps = pep8
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc . setuptools_git>=0.4
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,*egg .
[testenv:cover] [testenv:cover]
setenv = NOSE_WITH_COVERAGE=1 setenv = NOSE_WITH_COVERAGE=1