Minor bug fix for runnong app on Mac.

This commit is contained in:
Trullemans Gregory 2017-03-26 09:52:07 +02:00
parent e57c0d2862
commit fd5457fe82
2 changed files with 12 additions and 5 deletions

View File

@ -11,11 +11,13 @@ https://docs.djangoproject.com/en/dev/ref/settings/
from __future__ import absolute_import, unicode_literals
import environ
import os
ROOT_DIR = environ.Path(__file__) - 3 # (heima/config/settings/common.py - 3 = heima/)
APPS_DIR = ROOT_DIR.path('heima')
env = environ.Env()
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Load operating system environment variables and then prepare to use them
env = environ.Env()
@ -114,11 +116,16 @@ MANAGERS = ADMINS
# DATABASE CONFIGURATION
# ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#databases
# DATABASES = {
# 'default': env.db('DATABASE_URL', default='postgres:///django_heima'),
# }
# DATABASES['default']['ATOMIC_REQUESTS'] = True
DATABASES = {
'default': env.db('DATABASE_URL', default='postgres:///django_heima'),
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
DATABASES['default']['ATOMIC_REQUESTS'] = True
# GENERAL CONFIGURATION
# ------------------------------------------------------------------------------

View File

@ -28,7 +28,7 @@ django-allauth==0.30.0
# Python-PostgreSQL Database Adapter
psycopg2==2.6.2
# psycopg2==2.6.2
# Unicode slugification
awesome-slugify==1.6.5