Django 1.8 support / Project revamp #13

Merged
rafaelcaricio merged 20 commits from django-1.8-support into master 2015-07-20 07:57:38 +00:00
15 changed files with 9 additions and 9 deletions
Showing only changes of commit 9494a5ceac - Show all commits

View file

@ -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

View file

@ -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 = [
{

View file

@ -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'))