From 9494a5ceac5461c40910df1f2571d0b7e1e47af6 Mon Sep 17 00:00:00 2001 From: Rafael Caricio Date: Sun, 19 Jul 2015 12:20:37 +0200 Subject: [PATCH] Reoganize project to reflect final usage --- Makefile | 12 ++++++------ {vows/sandbox => sandbox}/__init__.py | 0 {vows/sandbox => sandbox}/main/__init__.py | 0 {vows/sandbox => sandbox}/main/admin.py | 0 {vows/sandbox => sandbox}/main/forms.py | 0 {vows/sandbox => sandbox}/main/models.py | 0 {vows/sandbox => sandbox}/main/views.py | 0 {vows/sandbox => sandbox}/manage.py | 0 {vows/sandbox => sandbox}/sandbox/__init__.py | 0 {vows/sandbox => sandbox}/sandbox/settings.py | 4 ++-- {vows/sandbox => sandbox}/sandbox/urls.py | 0 {vows/sandbox => sandbox}/sandbox/wsgi.py | 0 {vows/sandbox => sandbox}/templates/index.html | 0 {vows/sandbox => sandbox}/templates/name.html | 0 vows/test_config.py | 2 +- 15 files changed, 9 insertions(+), 9 deletions(-) rename {vows/sandbox => sandbox}/__init__.py (100%) rename {vows/sandbox => sandbox}/main/__init__.py (100%) rename {vows/sandbox => sandbox}/main/admin.py (100%) rename {vows/sandbox => sandbox}/main/forms.py (100%) rename {vows/sandbox => sandbox}/main/models.py (100%) rename {vows/sandbox => sandbox}/main/views.py (100%) rename {vows/sandbox => sandbox}/manage.py (100%) rename {vows/sandbox => sandbox}/sandbox/__init__.py (100%) rename {vows/sandbox => sandbox}/sandbox/settings.py (97%) rename {vows/sandbox => sandbox}/sandbox/urls.py (100%) rename {vows/sandbox => sandbox}/sandbox/wsgi.py (100%) rename {vows/sandbox => sandbox}/templates/index.html (100%) rename {vows/sandbox => sandbox}/templates/name.html (100%) diff --git a/Makefile b/Makefile index 8041e69..80f11f6 100644 --- a/Makefile +++ b/Makefile @@ -4,16 +4,16 @@ deps: @pip install -r requirements.txt sandbox_run: - @env PYTHONPATH=$$PYTHONPATH:vows:. python vows/sandbox/manage.py runserver + @env PYTHONPATH=sandbox:.:$$PYTHONPATH python sandbox/manage.py runserver sandbox_shell: - @env PYTHONPATH=$$PYTHONPATH:vows:. python vows/sandbox/manage.py shell + @env PYTHONPATH=sandbox:.:$$PYTHONPATH python sandbox/manage.py shell pyvows: - @env PYTHONPATH=$$PYTHONPATH:vows/sandbox/:. pyvows -c -l django_pyvows --profile-threshold 95 vows/ + @env PYTHONPATH=sandbox:.:$$PYTHONPATH pyvows -c -l django_pyvows --profile-threshold 95 vows/ -ci_test: - @env PYTHONPATH=$$PYTHONPATH:vows/sandbox/:. python vows/sandbox/manage.py syncdb && pyvows --no_color --cover --cover_package=django_pyvows --cover_threshold=100 -r django_pyvows.coverage.xml -x vows/ +ci_test: db + @env PYTHONPATH=sandbox:.:$$PYTHONPATH pyvows -c -l django_pyvows --profile-threshold 95 -r django_pyvows.coverage.xml vows/ db: - @env PYTHONPATH=$$PYTHONPATH:. python vows/sandbox/manage.py syncdb + @env PYTHONPATH=$$PYTHONPATH:. python sandbox/manage.py syncdb --noinput diff --git a/vows/sandbox/__init__.py b/sandbox/__init__.py similarity index 100% rename from vows/sandbox/__init__.py rename to sandbox/__init__.py diff --git a/vows/sandbox/main/__init__.py b/sandbox/main/__init__.py similarity index 100% rename from vows/sandbox/main/__init__.py rename to sandbox/main/__init__.py diff --git a/vows/sandbox/main/admin.py b/sandbox/main/admin.py similarity index 100% rename from vows/sandbox/main/admin.py rename to sandbox/main/admin.py diff --git a/vows/sandbox/main/forms.py b/sandbox/main/forms.py similarity index 100% rename from vows/sandbox/main/forms.py rename to sandbox/main/forms.py diff --git a/vows/sandbox/main/models.py b/sandbox/main/models.py similarity index 100% rename from vows/sandbox/main/models.py rename to sandbox/main/models.py diff --git a/vows/sandbox/main/views.py b/sandbox/main/views.py similarity index 100% rename from vows/sandbox/main/views.py rename to sandbox/main/views.py diff --git a/vows/sandbox/manage.py b/sandbox/manage.py similarity index 100% rename from vows/sandbox/manage.py rename to sandbox/manage.py diff --git a/vows/sandbox/sandbox/__init__.py b/sandbox/sandbox/__init__.py similarity index 100% rename from vows/sandbox/sandbox/__init__.py rename to sandbox/sandbox/__init__.py diff --git a/vows/sandbox/sandbox/settings.py b/sandbox/sandbox/settings.py similarity index 97% rename from vows/sandbox/sandbox/settings.py rename to sandbox/sandbox/settings.py index bb986a7..bd96828 100644 --- a/vows/sandbox/sandbox/settings.py +++ b/sandbox/sandbox/settings.py @@ -28,7 +28,7 @@ INSTALLED_APPS = ( 'django.contrib.messages', 'django.contrib.staticfiles', - 'sandbox.main', + 'main', ) MIDDLEWARE_CLASSES = ( @@ -42,7 +42,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.security.SecurityMiddleware', ) -ROOT_URLCONF = 'sandbox.sandbox.urls' +ROOT_URLCONF = 'sandbox.urls' TEMPLATES = [ { diff --git a/vows/sandbox/sandbox/urls.py b/sandbox/sandbox/urls.py similarity index 100% rename from vows/sandbox/sandbox/urls.py rename to sandbox/sandbox/urls.py diff --git a/vows/sandbox/sandbox/wsgi.py b/sandbox/sandbox/wsgi.py similarity index 100% rename from vows/sandbox/sandbox/wsgi.py rename to sandbox/sandbox/wsgi.py diff --git a/vows/sandbox/templates/index.html b/sandbox/templates/index.html similarity index 100% rename from vows/sandbox/templates/index.html rename to sandbox/templates/index.html diff --git a/vows/sandbox/templates/name.html b/sandbox/templates/name.html similarity index 100% rename from vows/sandbox/templates/name.html rename to sandbox/templates/name.html diff --git a/vows/test_config.py b/vows/test_config.py index e557ccc..c13d4ee 100644 --- a/vows/test_config.py +++ b/vows/test_config.py @@ -14,7 +14,7 @@ from django_pyvows.context import DjangoContext class ConfiguredVowsContext(DjangoContext): def settings_module(self): - return 'sandbox.sandbox.settings' + return 'sandbox.settings' def setup(self): self.TEST_FILE_PATH = abspath(join(dirname(__file__), 'fixtures/the_file.txt'))