move django_openstack out of src

django-openstack/Makefile

@@ -2,15 +2,22 @@ PYTHON=`which python`
 DESTDIR=/
 BUILDIR=$(CURDIR)/debian/django-openstack
 PROJECT=django-openstack
-VERSION=0.3.0
 
 all:
+	@echo "make buildout - Run through buildout"
+	@echo "make test - Run tests"
 	@echo "make source - Create source package"
 	@echo "make install - Install on local system"
 	@echo "make buildrpm - Generate a rpm package"
 	@echo "make builddeb - Generate a deb package"
 	@echo "make clean - Get rid of scratch and byte files"
 
+buildout: ./bin/buildout
+	./bin/buildout
+
+./bin/buildout:
+	$(PYTHON) bootstrap.py
+
 source:
 	$(PYTHON) setup.py sdist $(COMPILE)
 

django-openstack/setup.py

@@ -13,13 +13,11 @@ setup(
     long_description = read('README'),
     author = 'Devin Carlen',
     author_email = 'devin.carlen@gmail.com',
-    packages = find_packages('src'),
-    package_dir = {'': 'src'},
+    packages = find_packages(),
     package_data = {'django_openstack':
-                        [s[len('src/django_openstack/'):] for s in
-                         findall('src/django_openstack/templates')]},
-    install_requires = ['setuptools', 'boto==1.9b', 'mox>=0.5.0',
-                        'nova-adminclient'],
+                        [s[len('django_openstack/'):] for s in
+                         findall('django_openstack/templates')]},
+    install_requires = ['setuptools', 'mox>=0.5.0'],
     classifiers = [
         'Development Status :: 4 - Beta',
         'Framework :: Django',