From 764efad3b636c178c764d1b66c73f9edb298f2a1 Mon Sep 17 00:00:00 2001 From: termie Date: Wed, 22 Jun 2011 09:47:45 -0700 Subject: [PATCH] move django_openstack out of src --- django-openstack/Makefile | 9 ++++++++- .../{src => }/django_openstack/__init__.py | 0 django-openstack/{src => }/django_openstack/api.py | 0 .../{src => }/django_openstack/auth/__init__.py | 0 .../{src => }/django_openstack/auth/urls.py | 0 .../{src => }/django_openstack/auth/views.py | 0 .../django_openstack/context_processors.py | 0 .../{src => }/django_openstack/dash/__init__.py | 0 .../{src => }/django_openstack/dash/urls.py | 0 .../django_openstack/dash/views/__init__.py | 0 .../{src => }/django_openstack/dash/views/images.py | 0 .../django_openstack/dash/views/instances.py | 0 .../django_openstack/dash/views/keypairs.py | 0 .../{src => }/django_openstack/forms.py | 0 .../locale/en-gb/LC_MESSAGES/django.mo | Bin .../locale/en-gb/LC_MESSAGES/django.po | 0 .../locale/es/LC_MESSAGES/django.mo | Bin .../locale/es/LC_MESSAGES/django.po | 0 .../locale/fr/LC_MESSAGES/django.mo | Bin .../locale/fr/LC_MESSAGES/django.po | 0 .../locale/ja/LC_MESSAGES/django.mo | Bin .../locale/ja/LC_MESSAGES/django.po | 0 .../locale/pt/LC_MESSAGES/django.mo | Bin .../locale/pt/LC_MESSAGES/django.po | 0 .../locale/zh-cn/LC_MESSAGES/django.mo | Bin .../locale/zh-cn/LC_MESSAGES/django.po | 0 .../locale/zh-tw/LC_MESSAGES/django.mo | Bin .../locale/zh-tw/LC_MESSAGES/django.po | 0 .../django_openstack/middleware/__init__.py | 0 .../django_openstack/middleware/keystone.py | 0 .../{src => }/django_openstack/models.py | 0 .../{src => }/django_openstack/syspanel/__init__.py | 0 .../{src => }/django_openstack/syspanel/forms.py | 0 .../{src => }/django_openstack/syspanel/urls.py | 0 .../django_openstack/syspanel/views/__init__.py | 0 .../django_openstack/syspanel/views/flavors.py | 0 .../django_openstack/syspanel/views/images.py | 0 .../django_openstack/syspanel/views/instances.py | 0 .../django_openstack/syspanel/views/services.py | 0 .../django_openstack/syspanel/views/tenants.py | 0 .../django_openstack/syspanel/views/users.py | 0 .../templates/django_openstack/_messages.html | 0 .../templates/django_openstack/auth/_login.html | 0 .../templates/django_openstack/auth/_switch.html | 0 .../templates/django_openstack/dash/_launch.html | 0 .../templates/django_openstack/dash/_upload.html | 0 .../django_openstack/syspanel/_create_flavor.html | 0 .../django_openstack/templatetags/__init__.py | 0 .../templatetags/templatetags/__init__.py | 0 .../templatetags/templatetags/branding.py | 0 .../templatetags/templatetags/parse_date.py | 0 .../templatetags/templatetags/truncate_filter.py | 0 .../{src => }/django_openstack/tests/__init__.py | 0 .../{src => }/django_openstack/tests/base.py | 0 .../django_openstack/tests/credential_tests.py | 0 .../{src => }/django_openstack/tests/image_tests.py | 0 .../django_openstack/tests/instance_tests.py | 0 .../django_openstack/tests/keypair_tests.py | 0 .../django_openstack/tests/region_tests.py | 0 .../tests/templates/base-sidebar.html | 0 .../{src => }/django_openstack/tests/test_models.py | 0 .../django_openstack/tests/testsettings.py | 0 .../{src => }/django_openstack/tests/testurls.py | 0 .../django_openstack/tests/view_tests/__init__.py | 0 .../django_openstack/tests/volume_tests.py | 0 django-openstack/{src => }/django_openstack/urls.py | 0 .../{src => }/django_openstack/utils.py | 0 django-openstack/setup.py | 10 ++++------ 68 files changed, 12 insertions(+), 7 deletions(-) rename django-openstack/{src => }/django_openstack/__init__.py (100%) rename django-openstack/{src => }/django_openstack/api.py (100%) rename django-openstack/{src => }/django_openstack/auth/__init__.py (100%) rename django-openstack/{src => }/django_openstack/auth/urls.py (100%) rename django-openstack/{src => }/django_openstack/auth/views.py (100%) rename django-openstack/{src => }/django_openstack/context_processors.py (100%) rename django-openstack/{src => }/django_openstack/dash/__init__.py (100%) rename django-openstack/{src => }/django_openstack/dash/urls.py (100%) rename django-openstack/{src => }/django_openstack/dash/views/__init__.py (100%) rename django-openstack/{src => }/django_openstack/dash/views/images.py (100%) rename django-openstack/{src => }/django_openstack/dash/views/instances.py (100%) rename django-openstack/{src => }/django_openstack/dash/views/keypairs.py (100%) rename django-openstack/{src => }/django_openstack/forms.py (100%) rename django-openstack/{src => }/django_openstack/locale/en-gb/LC_MESSAGES/django.mo (100%) rename django-openstack/{src => }/django_openstack/locale/en-gb/LC_MESSAGES/django.po (100%) rename django-openstack/{src => }/django_openstack/locale/es/LC_MESSAGES/django.mo (100%) rename django-openstack/{src => }/django_openstack/locale/es/LC_MESSAGES/django.po (100%) rename django-openstack/{src => }/django_openstack/locale/fr/LC_MESSAGES/django.mo (100%) rename django-openstack/{src => }/django_openstack/locale/fr/LC_MESSAGES/django.po (100%) rename django-openstack/{src => }/django_openstack/locale/ja/LC_MESSAGES/django.mo (100%) rename django-openstack/{src => }/django_openstack/locale/ja/LC_MESSAGES/django.po (100%) rename django-openstack/{src => }/django_openstack/locale/pt/LC_MESSAGES/django.mo (100%) rename django-openstack/{src => }/django_openstack/locale/pt/LC_MESSAGES/django.po (100%) rename django-openstack/{src => }/django_openstack/locale/zh-cn/LC_MESSAGES/django.mo (100%) rename django-openstack/{src => }/django_openstack/locale/zh-cn/LC_MESSAGES/django.po (100%) rename django-openstack/{src => }/django_openstack/locale/zh-tw/LC_MESSAGES/django.mo (100%) rename django-openstack/{src => }/django_openstack/locale/zh-tw/LC_MESSAGES/django.po (100%) rename django-openstack/{src => }/django_openstack/middleware/__init__.py (100%) rename django-openstack/{src => }/django_openstack/middleware/keystone.py (100%) rename django-openstack/{src => }/django_openstack/models.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/__init__.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/forms.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/urls.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/views/__init__.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/views/flavors.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/views/images.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/views/instances.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/views/services.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/views/tenants.py (100%) rename django-openstack/{src => }/django_openstack/syspanel/views/users.py (100%) rename django-openstack/{src => }/django_openstack/templates/django_openstack/_messages.html (100%) rename django-openstack/{src => }/django_openstack/templates/django_openstack/auth/_login.html (100%) rename django-openstack/{src => }/django_openstack/templates/django_openstack/auth/_switch.html (100%) rename django-openstack/{src => }/django_openstack/templates/django_openstack/dash/_launch.html (100%) rename django-openstack/{src => }/django_openstack/templates/django_openstack/dash/_upload.html (100%) rename django-openstack/{src => }/django_openstack/templates/django_openstack/syspanel/_create_flavor.html (100%) rename django-openstack/{src => }/django_openstack/templatetags/__init__.py (100%) rename django-openstack/{src => }/django_openstack/templatetags/templatetags/__init__.py (100%) rename django-openstack/{src => }/django_openstack/templatetags/templatetags/branding.py (100%) rename django-openstack/{src => }/django_openstack/templatetags/templatetags/parse_date.py (100%) rename django-openstack/{src => }/django_openstack/templatetags/templatetags/truncate_filter.py (100%) rename django-openstack/{src => }/django_openstack/tests/__init__.py (100%) rename django-openstack/{src => }/django_openstack/tests/base.py (100%) rename django-openstack/{src => }/django_openstack/tests/credential_tests.py (100%) rename django-openstack/{src => }/django_openstack/tests/image_tests.py (100%) rename django-openstack/{src => }/django_openstack/tests/instance_tests.py (100%) rename django-openstack/{src => }/django_openstack/tests/keypair_tests.py (100%) rename django-openstack/{src => }/django_openstack/tests/region_tests.py (100%) rename django-openstack/{src => }/django_openstack/tests/templates/base-sidebar.html (100%) rename django-openstack/{src => }/django_openstack/tests/test_models.py (100%) rename django-openstack/{src => }/django_openstack/tests/testsettings.py (100%) rename django-openstack/{src => }/django_openstack/tests/testurls.py (100%) rename django-openstack/{src => }/django_openstack/tests/view_tests/__init__.py (100%) rename django-openstack/{src => }/django_openstack/tests/volume_tests.py (100%) rename django-openstack/{src => }/django_openstack/urls.py (100%) rename django-openstack/{src => }/django_openstack/utils.py (100%) diff --git a/django-openstack/Makefile b/django-openstack/Makefile index 43760b203..7836a8bdf 100644 --- a/django-openstack/Makefile +++ b/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) diff --git a/django-openstack/src/django_openstack/__init__.py b/django-openstack/django_openstack/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/__init__.py rename to django-openstack/django_openstack/__init__.py diff --git a/django-openstack/src/django_openstack/api.py b/django-openstack/django_openstack/api.py similarity index 100% rename from django-openstack/src/django_openstack/api.py rename to django-openstack/django_openstack/api.py diff --git a/django-openstack/src/django_openstack/auth/__init__.py b/django-openstack/django_openstack/auth/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/auth/__init__.py rename to django-openstack/django_openstack/auth/__init__.py diff --git a/django-openstack/src/django_openstack/auth/urls.py b/django-openstack/django_openstack/auth/urls.py similarity index 100% rename from django-openstack/src/django_openstack/auth/urls.py rename to django-openstack/django_openstack/auth/urls.py diff --git a/django-openstack/src/django_openstack/auth/views.py b/django-openstack/django_openstack/auth/views.py similarity index 100% rename from django-openstack/src/django_openstack/auth/views.py rename to django-openstack/django_openstack/auth/views.py diff --git a/django-openstack/src/django_openstack/context_processors.py b/django-openstack/django_openstack/context_processors.py similarity index 100% rename from django-openstack/src/django_openstack/context_processors.py rename to django-openstack/django_openstack/context_processors.py diff --git a/django-openstack/src/django_openstack/dash/__init__.py b/django-openstack/django_openstack/dash/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/dash/__init__.py rename to django-openstack/django_openstack/dash/__init__.py diff --git a/django-openstack/src/django_openstack/dash/urls.py b/django-openstack/django_openstack/dash/urls.py similarity index 100% rename from django-openstack/src/django_openstack/dash/urls.py rename to django-openstack/django_openstack/dash/urls.py diff --git a/django-openstack/src/django_openstack/dash/views/__init__.py b/django-openstack/django_openstack/dash/views/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/dash/views/__init__.py rename to django-openstack/django_openstack/dash/views/__init__.py diff --git a/django-openstack/src/django_openstack/dash/views/images.py b/django-openstack/django_openstack/dash/views/images.py similarity index 100% rename from django-openstack/src/django_openstack/dash/views/images.py rename to django-openstack/django_openstack/dash/views/images.py diff --git a/django-openstack/src/django_openstack/dash/views/instances.py b/django-openstack/django_openstack/dash/views/instances.py similarity index 100% rename from django-openstack/src/django_openstack/dash/views/instances.py rename to django-openstack/django_openstack/dash/views/instances.py diff --git a/django-openstack/src/django_openstack/dash/views/keypairs.py b/django-openstack/django_openstack/dash/views/keypairs.py similarity index 100% rename from django-openstack/src/django_openstack/dash/views/keypairs.py rename to django-openstack/django_openstack/dash/views/keypairs.py diff --git a/django-openstack/src/django_openstack/forms.py b/django-openstack/django_openstack/forms.py similarity index 100% rename from django-openstack/src/django_openstack/forms.py rename to django-openstack/django_openstack/forms.py diff --git a/django-openstack/src/django_openstack/locale/en-gb/LC_MESSAGES/django.mo b/django-openstack/django_openstack/locale/en-gb/LC_MESSAGES/django.mo similarity index 100% rename from django-openstack/src/django_openstack/locale/en-gb/LC_MESSAGES/django.mo rename to django-openstack/django_openstack/locale/en-gb/LC_MESSAGES/django.mo diff --git a/django-openstack/src/django_openstack/locale/en-gb/LC_MESSAGES/django.po b/django-openstack/django_openstack/locale/en-gb/LC_MESSAGES/django.po similarity index 100% rename from django-openstack/src/django_openstack/locale/en-gb/LC_MESSAGES/django.po rename to django-openstack/django_openstack/locale/en-gb/LC_MESSAGES/django.po diff --git a/django-openstack/src/django_openstack/locale/es/LC_MESSAGES/django.mo b/django-openstack/django_openstack/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from django-openstack/src/django_openstack/locale/es/LC_MESSAGES/django.mo rename to django-openstack/django_openstack/locale/es/LC_MESSAGES/django.mo diff --git a/django-openstack/src/django_openstack/locale/es/LC_MESSAGES/django.po b/django-openstack/django_openstack/locale/es/LC_MESSAGES/django.po similarity index 100% rename from django-openstack/src/django_openstack/locale/es/LC_MESSAGES/django.po rename to django-openstack/django_openstack/locale/es/LC_MESSAGES/django.po diff --git a/django-openstack/src/django_openstack/locale/fr/LC_MESSAGES/django.mo b/django-openstack/django_openstack/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from django-openstack/src/django_openstack/locale/fr/LC_MESSAGES/django.mo rename to django-openstack/django_openstack/locale/fr/LC_MESSAGES/django.mo diff --git a/django-openstack/src/django_openstack/locale/fr/LC_MESSAGES/django.po b/django-openstack/django_openstack/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from django-openstack/src/django_openstack/locale/fr/LC_MESSAGES/django.po rename to django-openstack/django_openstack/locale/fr/LC_MESSAGES/django.po diff --git a/django-openstack/src/django_openstack/locale/ja/LC_MESSAGES/django.mo b/django-openstack/django_openstack/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from django-openstack/src/django_openstack/locale/ja/LC_MESSAGES/django.mo rename to django-openstack/django_openstack/locale/ja/LC_MESSAGES/django.mo diff --git a/django-openstack/src/django_openstack/locale/ja/LC_MESSAGES/django.po b/django-openstack/django_openstack/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from django-openstack/src/django_openstack/locale/ja/LC_MESSAGES/django.po rename to django-openstack/django_openstack/locale/ja/LC_MESSAGES/django.po diff --git a/django-openstack/src/django_openstack/locale/pt/LC_MESSAGES/django.mo b/django-openstack/django_openstack/locale/pt/LC_MESSAGES/django.mo similarity index 100% rename from django-openstack/src/django_openstack/locale/pt/LC_MESSAGES/django.mo rename to django-openstack/django_openstack/locale/pt/LC_MESSAGES/django.mo diff --git a/django-openstack/src/django_openstack/locale/pt/LC_MESSAGES/django.po b/django-openstack/django_openstack/locale/pt/LC_MESSAGES/django.po similarity index 100% rename from django-openstack/src/django_openstack/locale/pt/LC_MESSAGES/django.po rename to django-openstack/django_openstack/locale/pt/LC_MESSAGES/django.po diff --git a/django-openstack/src/django_openstack/locale/zh-cn/LC_MESSAGES/django.mo b/django-openstack/django_openstack/locale/zh-cn/LC_MESSAGES/django.mo similarity index 100% rename from django-openstack/src/django_openstack/locale/zh-cn/LC_MESSAGES/django.mo rename to django-openstack/django_openstack/locale/zh-cn/LC_MESSAGES/django.mo diff --git a/django-openstack/src/django_openstack/locale/zh-cn/LC_MESSAGES/django.po b/django-openstack/django_openstack/locale/zh-cn/LC_MESSAGES/django.po similarity index 100% rename from django-openstack/src/django_openstack/locale/zh-cn/LC_MESSAGES/django.po rename to django-openstack/django_openstack/locale/zh-cn/LC_MESSAGES/django.po diff --git a/django-openstack/src/django_openstack/locale/zh-tw/LC_MESSAGES/django.mo b/django-openstack/django_openstack/locale/zh-tw/LC_MESSAGES/django.mo similarity index 100% rename from django-openstack/src/django_openstack/locale/zh-tw/LC_MESSAGES/django.mo rename to django-openstack/django_openstack/locale/zh-tw/LC_MESSAGES/django.mo diff --git a/django-openstack/src/django_openstack/locale/zh-tw/LC_MESSAGES/django.po b/django-openstack/django_openstack/locale/zh-tw/LC_MESSAGES/django.po similarity index 100% rename from django-openstack/src/django_openstack/locale/zh-tw/LC_MESSAGES/django.po rename to django-openstack/django_openstack/locale/zh-tw/LC_MESSAGES/django.po diff --git a/django-openstack/src/django_openstack/middleware/__init__.py b/django-openstack/django_openstack/middleware/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/middleware/__init__.py rename to django-openstack/django_openstack/middleware/__init__.py diff --git a/django-openstack/src/django_openstack/middleware/keystone.py b/django-openstack/django_openstack/middleware/keystone.py similarity index 100% rename from django-openstack/src/django_openstack/middleware/keystone.py rename to django-openstack/django_openstack/middleware/keystone.py diff --git a/django-openstack/src/django_openstack/models.py b/django-openstack/django_openstack/models.py similarity index 100% rename from django-openstack/src/django_openstack/models.py rename to django-openstack/django_openstack/models.py diff --git a/django-openstack/src/django_openstack/syspanel/__init__.py b/django-openstack/django_openstack/syspanel/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/__init__.py rename to django-openstack/django_openstack/syspanel/__init__.py diff --git a/django-openstack/src/django_openstack/syspanel/forms.py b/django-openstack/django_openstack/syspanel/forms.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/forms.py rename to django-openstack/django_openstack/syspanel/forms.py diff --git a/django-openstack/src/django_openstack/syspanel/urls.py b/django-openstack/django_openstack/syspanel/urls.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/urls.py rename to django-openstack/django_openstack/syspanel/urls.py diff --git a/django-openstack/src/django_openstack/syspanel/views/__init__.py b/django-openstack/django_openstack/syspanel/views/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/views/__init__.py rename to django-openstack/django_openstack/syspanel/views/__init__.py diff --git a/django-openstack/src/django_openstack/syspanel/views/flavors.py b/django-openstack/django_openstack/syspanel/views/flavors.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/views/flavors.py rename to django-openstack/django_openstack/syspanel/views/flavors.py diff --git a/django-openstack/src/django_openstack/syspanel/views/images.py b/django-openstack/django_openstack/syspanel/views/images.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/views/images.py rename to django-openstack/django_openstack/syspanel/views/images.py diff --git a/django-openstack/src/django_openstack/syspanel/views/instances.py b/django-openstack/django_openstack/syspanel/views/instances.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/views/instances.py rename to django-openstack/django_openstack/syspanel/views/instances.py diff --git a/django-openstack/src/django_openstack/syspanel/views/services.py b/django-openstack/django_openstack/syspanel/views/services.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/views/services.py rename to django-openstack/django_openstack/syspanel/views/services.py diff --git a/django-openstack/src/django_openstack/syspanel/views/tenants.py b/django-openstack/django_openstack/syspanel/views/tenants.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/views/tenants.py rename to django-openstack/django_openstack/syspanel/views/tenants.py diff --git a/django-openstack/src/django_openstack/syspanel/views/users.py b/django-openstack/django_openstack/syspanel/views/users.py similarity index 100% rename from django-openstack/src/django_openstack/syspanel/views/users.py rename to django-openstack/django_openstack/syspanel/views/users.py diff --git a/django-openstack/src/django_openstack/templates/django_openstack/_messages.html b/django-openstack/django_openstack/templates/django_openstack/_messages.html similarity index 100% rename from django-openstack/src/django_openstack/templates/django_openstack/_messages.html rename to django-openstack/django_openstack/templates/django_openstack/_messages.html diff --git a/django-openstack/src/django_openstack/templates/django_openstack/auth/_login.html b/django-openstack/django_openstack/templates/django_openstack/auth/_login.html similarity index 100% rename from django-openstack/src/django_openstack/templates/django_openstack/auth/_login.html rename to django-openstack/django_openstack/templates/django_openstack/auth/_login.html diff --git a/django-openstack/src/django_openstack/templates/django_openstack/auth/_switch.html b/django-openstack/django_openstack/templates/django_openstack/auth/_switch.html similarity index 100% rename from django-openstack/src/django_openstack/templates/django_openstack/auth/_switch.html rename to django-openstack/django_openstack/templates/django_openstack/auth/_switch.html diff --git a/django-openstack/src/django_openstack/templates/django_openstack/dash/_launch.html b/django-openstack/django_openstack/templates/django_openstack/dash/_launch.html similarity index 100% rename from django-openstack/src/django_openstack/templates/django_openstack/dash/_launch.html rename to django-openstack/django_openstack/templates/django_openstack/dash/_launch.html diff --git a/django-openstack/src/django_openstack/templates/django_openstack/dash/_upload.html b/django-openstack/django_openstack/templates/django_openstack/dash/_upload.html similarity index 100% rename from django-openstack/src/django_openstack/templates/django_openstack/dash/_upload.html rename to django-openstack/django_openstack/templates/django_openstack/dash/_upload.html diff --git a/django-openstack/src/django_openstack/templates/django_openstack/syspanel/_create_flavor.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/_create_flavor.html similarity index 100% rename from django-openstack/src/django_openstack/templates/django_openstack/syspanel/_create_flavor.html rename to django-openstack/django_openstack/templates/django_openstack/syspanel/_create_flavor.html diff --git a/django-openstack/src/django_openstack/templatetags/__init__.py b/django-openstack/django_openstack/templatetags/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/templatetags/__init__.py rename to django-openstack/django_openstack/templatetags/__init__.py diff --git a/django-openstack/src/django_openstack/templatetags/templatetags/__init__.py b/django-openstack/django_openstack/templatetags/templatetags/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/templatetags/templatetags/__init__.py rename to django-openstack/django_openstack/templatetags/templatetags/__init__.py diff --git a/django-openstack/src/django_openstack/templatetags/templatetags/branding.py b/django-openstack/django_openstack/templatetags/templatetags/branding.py similarity index 100% rename from django-openstack/src/django_openstack/templatetags/templatetags/branding.py rename to django-openstack/django_openstack/templatetags/templatetags/branding.py diff --git a/django-openstack/src/django_openstack/templatetags/templatetags/parse_date.py b/django-openstack/django_openstack/templatetags/templatetags/parse_date.py similarity index 100% rename from django-openstack/src/django_openstack/templatetags/templatetags/parse_date.py rename to django-openstack/django_openstack/templatetags/templatetags/parse_date.py diff --git a/django-openstack/src/django_openstack/templatetags/templatetags/truncate_filter.py b/django-openstack/django_openstack/templatetags/templatetags/truncate_filter.py similarity index 100% rename from django-openstack/src/django_openstack/templatetags/templatetags/truncate_filter.py rename to django-openstack/django_openstack/templatetags/templatetags/truncate_filter.py diff --git a/django-openstack/src/django_openstack/tests/__init__.py b/django-openstack/django_openstack/tests/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/tests/__init__.py rename to django-openstack/django_openstack/tests/__init__.py diff --git a/django-openstack/src/django_openstack/tests/base.py b/django-openstack/django_openstack/tests/base.py similarity index 100% rename from django-openstack/src/django_openstack/tests/base.py rename to django-openstack/django_openstack/tests/base.py diff --git a/django-openstack/src/django_openstack/tests/credential_tests.py b/django-openstack/django_openstack/tests/credential_tests.py similarity index 100% rename from django-openstack/src/django_openstack/tests/credential_tests.py rename to django-openstack/django_openstack/tests/credential_tests.py diff --git a/django-openstack/src/django_openstack/tests/image_tests.py b/django-openstack/django_openstack/tests/image_tests.py similarity index 100% rename from django-openstack/src/django_openstack/tests/image_tests.py rename to django-openstack/django_openstack/tests/image_tests.py diff --git a/django-openstack/src/django_openstack/tests/instance_tests.py b/django-openstack/django_openstack/tests/instance_tests.py similarity index 100% rename from django-openstack/src/django_openstack/tests/instance_tests.py rename to django-openstack/django_openstack/tests/instance_tests.py diff --git a/django-openstack/src/django_openstack/tests/keypair_tests.py b/django-openstack/django_openstack/tests/keypair_tests.py similarity index 100% rename from django-openstack/src/django_openstack/tests/keypair_tests.py rename to django-openstack/django_openstack/tests/keypair_tests.py diff --git a/django-openstack/src/django_openstack/tests/region_tests.py b/django-openstack/django_openstack/tests/region_tests.py similarity index 100% rename from django-openstack/src/django_openstack/tests/region_tests.py rename to django-openstack/django_openstack/tests/region_tests.py diff --git a/django-openstack/src/django_openstack/tests/templates/base-sidebar.html b/django-openstack/django_openstack/tests/templates/base-sidebar.html similarity index 100% rename from django-openstack/src/django_openstack/tests/templates/base-sidebar.html rename to django-openstack/django_openstack/tests/templates/base-sidebar.html diff --git a/django-openstack/src/django_openstack/tests/test_models.py b/django-openstack/django_openstack/tests/test_models.py similarity index 100% rename from django-openstack/src/django_openstack/tests/test_models.py rename to django-openstack/django_openstack/tests/test_models.py diff --git a/django-openstack/src/django_openstack/tests/testsettings.py b/django-openstack/django_openstack/tests/testsettings.py similarity index 100% rename from django-openstack/src/django_openstack/tests/testsettings.py rename to django-openstack/django_openstack/tests/testsettings.py diff --git a/django-openstack/src/django_openstack/tests/testurls.py b/django-openstack/django_openstack/tests/testurls.py similarity index 100% rename from django-openstack/src/django_openstack/tests/testurls.py rename to django-openstack/django_openstack/tests/testurls.py diff --git a/django-openstack/src/django_openstack/tests/view_tests/__init__.py b/django-openstack/django_openstack/tests/view_tests/__init__.py similarity index 100% rename from django-openstack/src/django_openstack/tests/view_tests/__init__.py rename to django-openstack/django_openstack/tests/view_tests/__init__.py diff --git a/django-openstack/src/django_openstack/tests/volume_tests.py b/django-openstack/django_openstack/tests/volume_tests.py similarity index 100% rename from django-openstack/src/django_openstack/tests/volume_tests.py rename to django-openstack/django_openstack/tests/volume_tests.py diff --git a/django-openstack/src/django_openstack/urls.py b/django-openstack/django_openstack/urls.py similarity index 100% rename from django-openstack/src/django_openstack/urls.py rename to django-openstack/django_openstack/urls.py diff --git a/django-openstack/src/django_openstack/utils.py b/django-openstack/django_openstack/utils.py similarity index 100% rename from django-openstack/src/django_openstack/utils.py rename to django-openstack/django_openstack/utils.py diff --git a/django-openstack/setup.py b/django-openstack/setup.py index 6f8020f88..909bf4b2d 100755 --- a/django-openstack/setup.py +++ b/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',