Merge branch 'master' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Aufinal/communication_models

This commit is contained in:
Ludovic Stephan 2017-07-20 15:24:23 +02:00
commit 3439abe922
3 changed files with 25 additions and 2 deletions

2
.gitignore vendored
View file

@ -3,5 +3,5 @@ __pycache__
venv
evenementiel/settings.py
.*.swp
*.pyc
*.sqlite3

View file

@ -0,0 +1,23 @@
"""
Django development settings for GestionÉvénementiel
The settings that are not listed here are imported from .common
"""
import os
from .dev import * # NOQA
# SQLite
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
CHANNEL_LAYERS = {
"default": {
"BACKEND": "asgiref.inmemory.ChannelLayer",
"ROUTING": "evenementiel.routing.channel_routing",
},
}

View file

@ -3,7 +3,7 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "evenementiel.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "evenementiel.settings.devlocal")
from django.core.management import execute_from_command_line