File diff 97748a0f7ffa → 39b556b7ac4f
pinaxcon/settings.py
Show inline comments
 
import os
 
import dj_database_url
 
from django.utils.crypto import get_random_string
 

	
 

	
...
 
@@ -7,7 +6,7 @@ PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir
 
PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
BASE_DIR = PACKAGE_ROOT
 

	
 
DEBUG = True #bool(int(os.environ.get("DEBUG", "1")))
 
DEBUG = True  # bool(int(os.environ.get("DEBUG", "1")))
 

	
 
DATABASES = {
 
    "default": {
...
 
@@ -152,7 +151,7 @@ INSTALLED_APPS = [
 
    "django_countries",
 
    "registripe",
 

	
 
    #admin - required by registrasion ??
 
    # admin - required by registrasion ??
 
    "nested_admin",
 

	
 
    # project
...
 
@@ -163,7 +162,7 @@ INSTALLED_APPS = [
 
    "jquery",
 
    "djangoformsetjs",
 

	
 
    #testing
 
    # testing
 
    "django_nose",
 
]
 

	
...
 
@@ -204,7 +203,7 @@ LOGGING = {
 
        }
 
    },
 
    'handlers': {
 
         'console':{
 
        'console': {
 
            'level': 'DEBUG',
 
            'class': 'logging.StreamHandler',
 
            'formatter': 'simple'
...
 
@@ -273,8 +272,8 @@ PROPOSAL_FORMS = {
 
    "openhardware-miniconf": "pinaxcon.proposals.forms.OpenHardwareProposalForm",
 
}
 

	
 
#PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet"
 
#PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet"
 
# PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet"
 
# PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet"
 

	
 
# Registrasion bits:
 
ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
...
 
@@ -308,6 +307,6 @@ try:
 
    LOCAL_SETTINGS
 
except NameError:
 
    try:
 
        from local_settings import *
 
        from local_settings import *  # noqa: F401,F403
 
    except ImportError:
 
        pass