From 849a4062cdf8af50b8c3d44611f10857fedf6813 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 21:35:55 -0700 Subject: Changed Makefile to shell script. The Makefile approach completely broke debhelper's ability to figure out that this was a python package. --- Makefile | 40 ---------------------------------------- run_tests.sh | 13 +++++++++++++ 2 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 Makefile create mode 100644 run_tests.sh diff --git a/Makefile b/Makefile deleted file mode 100644 index 847da779f..000000000 --- a/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -venv=.nova-venv -with_venv=tools/with_venv.sh - -build: - # Nothing to do - -default_test_type:= $(shell if [ -e $(venv) ]; then echo venv; else echo system; fi) - -test: test-$(default_test_type) - -test-venv: $(venv) - $(with_venv) python run_tests.py - -test-system: - python run_tests.py - -clean: - rm -rf _trial_temp - rm -rf keys - rm -rf instances - rm -rf networks - rm -f run_tests.err.log - -clean-all: clean - rm -rf $(venv) - -MANIFEST.in: - [ -d .bzr ] || (echo "Must be a bzr checkout" ; exit 1) - bzr ls --kind=file -VR | while read f; do echo include "$$f"; done > $@ - -sdist: MANIFEST.in - python setup.py sdist - -$(venv): - @echo "You need to install the Nova virtualenv before you can run this." - @echo "" - @echo "Please run tools/install_venv.py" - @exit 1 - -.PHONY: MANIFEST.in diff --git a/run_tests.sh b/run_tests.sh new file mode 100644 index 000000000..1bf3d1a79 --- /dev/null +++ b/run_tests.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +venv=.nova-venv +with_venv=tools/with_venv.sh + +if [ -e ${venv} ]; then + ${with_venv} python run_tests.py +else + echo "You need to install the Nova virtualenv before you can run this." + echo "" + echo "Please run tools/install_venv.py" + exit 1 +fi -- cgit From 26113f6b1379aa81941169b858aee37493bad63a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 21:39:23 -0700 Subject: Put in a single MANIFEST.in file that takes care of things. --- MANIFEST.in | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..6482bd7ea --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +include HACKING LICENSE run_tests.sh run_test.py README builddeb.sh exercise_rsapi.py +graft CA +graft doc +graft smoketests +graft tools -- cgit From 464311c787d3d3176a89ec44791a03034ccb2851 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 21:39:58 -0700 Subject: Made run_tests.sh executable. --- run_tests.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 run_tests.sh diff --git a/run_tests.sh b/run_tests.sh old mode 100644 new mode 100755 -- cgit From 9587bd8ce817d71a8581ac16d0820714fbb10d02 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 21:40:06 -0700 Subject: Removed gitignore files. --- .gitignore | 12 ------------ CA/.gitignore | 11 ----------- CA/INTER/.gitignore | 1 - CA/reqs/.gitignore | 1 - 4 files changed, 25 deletions(-) delete mode 100644 .gitignore delete mode 100644 CA/.gitignore delete mode 100644 CA/INTER/.gitignore delete mode 100644 CA/reqs/.gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2afc7a32c..000000000 --- a/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.pyc -*.DS_Store -local_settings.py -CA/index.txt -CA/serial -keeper -instances -keys -build/* -build-stamp -nova.egg-info -.nova-venv diff --git a/CA/.gitignore b/CA/.gitignore deleted file mode 100644 index fae0922bf..000000000 --- a/CA/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -index.txt -index.txt.old -index.txt.attr -index.txt.attr.old -cacert.pem -serial -serial.old -openssl.cnf -private/* -newcerts/* - diff --git a/CA/INTER/.gitignore b/CA/INTER/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/CA/INTER/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/CA/reqs/.gitignore b/CA/reqs/.gitignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/CA/reqs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -* -- cgit From ea89153b930eed70c7586eae56636b648e4e7252 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 21:41:07 -0700 Subject: Updated setup.py file to install stuff on a python setup.py install command. --- setup.cfg | 10 ++++++++-- setup.py | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/setup.cfg b/setup.cfg index 839472544..14dcb5c8e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,10 @@ [build_sphinx] +all_files = 1 +build-dir = doc/build source-dir = doc/source -build-dir = doc/build -all_files = 1 + +[egg_info] +tag_build = +tag_date = 0 +tag_svn_revision = 0 + diff --git a/setup.py b/setup.py index f9a616335..127d014b1 100644 --- a/setup.py +++ b/setup.py @@ -16,19 +16,24 @@ # License for the specific language governing permissions and limitations # under the License. -import glob -import os -import sys - from setuptools import setup, find_packages -srcdir = os.path.join(os.path.dirname(sys.argv[0]), 'src') - setup(name='nova', version='0.9.0', description='cloud computing fabric controller', author='OpenStack', author_email='nova@lists.launchpad.net', url='http://www.openstack.org/', - packages = find_packages(), + packages = find_packages(exclude=['bin','smoketests']), + scripts=['bin/nova-api', + 'bin/nova-compute', + 'bin/nova-dhcpbridge', + 'bin/nova-import-canonical-imagestore', + 'bin/nova-instancemonitor', + 'bin/nova-manage', + 'bin/nova-network', + 'bin/nova-objectstore', + 'bin/nova-rsapi', + 'bin/nova-volume', + ] ) -- cgit From 67711b8aa4ed0ec80d407fecea5b4bf5ffc22322 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 21:52:01 -0700 Subject: Added a few more missing files to MANIFEST.in and added some placeholder files so that setup.py would carry the empty dir. --- CA/INTER/.placeholder | 0 CA/reqs/.placeholder | 0 MANIFEST.in | 19 ++++++++++++++++++- doc/build/.placeholder | 0 doc/source/_static/.placeholder | 0 doc/source/_templates/.placeholder | 0 6 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 CA/INTER/.placeholder create mode 100644 CA/reqs/.placeholder create mode 100644 doc/build/.placeholder create mode 100644 doc/source/_static/.placeholder create mode 100644 doc/source/_templates/.placeholder diff --git a/CA/INTER/.placeholder b/CA/INTER/.placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/CA/reqs/.placeholder b/CA/reqs/.placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/MANIFEST.in b/MANIFEST.in index 6482bd7ea..36482be88 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,22 @@ -include HACKING LICENSE run_tests.sh run_test.py README builddeb.sh exercise_rsapi.py +include HACKING LICENSE run_tests.py run_tests.sh +include README builddeb.sh exercise_rsapi.py graft CA graft doc graft smoketests graft tools +include nova/auth/novarc.template +include nova/auth/slap.sh +include nova/cloudpipe/bootscript.sh +include nova/cloudpipe/client.ovpn.template +include nova/compute/fakevirtinstance.xml +include nova/compute/interfaces.template +include nova/compute/libvirt.xml.template +include nova/tests/CA/ +include nova/tests/CA/cacert.pem +include nova/tests/CA/private/ +include nova/tests/CA/private/cakey.pem +include nova/tests/bundle/ +include nova/tests/bundle/1mb.manifest.xml +include nova/tests/bundle/1mb.part.0 +include nova/tests/bundle/1mb.part.1 +include diff --git a/doc/build/.placeholder b/doc/build/.placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/doc/source/_static/.placeholder b/doc/source/_static/.placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/doc/source/_templates/.placeholder b/doc/source/_templates/.placeholder new file mode 100644 index 000000000..e69de29bb -- cgit From 25de868554bbf1a9c6e5f9ed295bef6c37194352 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 23:18:27 -0700 Subject: Added the gitignore files back in for the folks who are still on the git. --- .gitignore | 12 ++++++++++++ CA/.gitignore | 11 +++++++++++ CA/INTER/.gitignore | 1 + CA/reqs/.gitignore | 1 + 4 files changed, 25 insertions(+) create mode 100644 .gitignore create mode 100644 CA/.gitignore create mode 100644 CA/INTER/.gitignore create mode 100644 CA/reqs/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..2afc7a32c --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +*.pyc +*.DS_Store +local_settings.py +CA/index.txt +CA/serial +keeper +instances +keys +build/* +build-stamp +nova.egg-info +.nova-venv diff --git a/CA/.gitignore b/CA/.gitignore new file mode 100644 index 000000000..fae0922bf --- /dev/null +++ b/CA/.gitignore @@ -0,0 +1,11 @@ +index.txt +index.txt.old +index.txt.attr +index.txt.attr.old +cacert.pem +serial +serial.old +openssl.cnf +private/* +newcerts/* + diff --git a/CA/INTER/.gitignore b/CA/INTER/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/CA/INTER/.gitignore @@ -0,0 +1 @@ +* diff --git a/CA/reqs/.gitignore b/CA/reqs/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/CA/reqs/.gitignore @@ -0,0 +1 @@ +* -- cgit From 90ffbc240ffc68154816d2237dc04ea33f5066cb Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 27 Jul 2010 23:23:23 -0700 Subject: Removed extra include. --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 36482be88..e917077c5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -19,4 +19,3 @@ include nova/tests/bundle/ include nova/tests/bundle/1mb.manifest.xml include nova/tests/bundle/1mb.part.0 include nova/tests/bundle/1mb.part.1 -include -- cgit