Commit 8bd7dd09 authored by Patrick Kimber's avatar Patrick Kimber

rename 'example' to 'example_booking'

parent fb9b1ce8
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
from .celery import app as celery_app
from __future__ import unicode_literals
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
from __future__ import unicode_literals
""" Django settings """ """ Django settings """
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy
...@@ -94,7 +92,7 @@ MIDDLEWARE_CLASSES = ( ...@@ -94,7 +92,7 @@ MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'example_booking.urls' ROOT_URLCONF = 'example_booking.urls'
# Python dotted path to the WSGI application used by Django's runserver. # Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'example.wsgi.application' WSGI_APPLICATION = 'example_booking.wsgi.application'
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
...@@ -125,6 +123,7 @@ LOCAL_APPS = ( ...@@ -125,6 +123,7 @@ LOCAL_APPS = (
'base', 'base',
'booking', 'booking',
'login', 'login',
'mail',
) )
INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
......
# -*- encoding: utf-8 -*-
from celery import Celery
#from celery.schedules import crontab
from django.conf import settings
# Working through:
# http://docs.celeryproject.org/en/latest/django/first-steps-with-django.html#using-celery-with-django
app = Celery('example_booking')
# Config in one of three ways:
# 1) settings on the app
# app.conf.BROKER_URL = 'redis://localhost:6379/0'
# app.conf.CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
# 2) dedicated config module ('project/celeryconfig.py')
# app.config_from_object('project.celeryconfig')
# 3) read from the django settings
app.config_from_object('django.conf:settings')
app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
from __future__ import unicode_literals
from .base import * from .base import *
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
...@@ -13,3 +12,6 @@ DATABASES = { ...@@ -13,3 +12,6 @@ DATABASES = {
'PORT': '', 'PORT': '',
} }
} }
# http://docs.celeryproject.org/en/2.5/django/unit-testing.html
CELERY_ALWAYS_EAGER = True
# -*- encoding: utf-8 -*-
from .base import *
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': 'temp.db',
'USER': '',
'PASSWORD': '',
'HOST': '',
'PORT': '',
}
}
# http://docs.celeryproject.org/en/2.5/django/unit-testing.html
CELERY_ALWAYS_EAGER = True
bleach==1.4 bleach==1.4
celery==3.1.17
django-braces==1.4.0 django-braces==1.4.0
django-compressor==1.4 django-compressor==1.4
django-redis==3.8.3
django-reversion==1.8.5 django-reversion==1.8.5
django-sendfile==0.3.6 django-sendfile==0.3.6
Django==1.7.2 Django==1.7.2
...@@ -8,4 +10,5 @@ easy-thumbnails==2.2 ...@@ -8,4 +10,5 @@ easy-thumbnails==2.2
pillow==2.7.0 pillow==2.7.0
python-dateutil==2.2 python-dateutil==2.2
pytz==2014.9 pytz==2014.9
redis==2.10.3
reportlab==3.1.44 reportlab==3.1.44
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
-e . -e .
-e ../base -e ../base
-e ../login -e ../login
-e ../mail
beautifulsoup4 beautifulsoup4
devpi-client devpi-client
factory-boy factory-boy
......
[pytest] [pytest]
DJANGO_SETTINGS_MODULE = example_booking.dev_test
norecursedirs = .git venv-* norecursedirs = .git venv-*
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment