settings: change settings format, exclude circle module from test (it brokes some test)

circle/circle/settings/base.py

@@ -166,15 +166,14 @@ if exists(p):
     STATICFILES_DIRS.append(p)
 
 STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
-PIPELINE_COMPILERS = (
-    'pipeline.compilers.less.LessCompiler',
-)
-PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
-# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.slimit.SlimItCompressor'
-PIPELINE_JS_COMPRESSOR = None
-PIPELINE_DISABLE_WRAPPER = True
-PIPELINE_LESS_ARGUMENTS = u'--include-path={}'.format(':'.join(STATICFILES_DIRS))
-PIPELINE_CSS = {
+
+PIPELINE = {
+    'COMPILERS' : ('pipeline.compilers.less.LessCompiler',),
+    'LESS_ARGUMENTS': u'--include-path={}'.format(':'.join(STATICFILES_DIRS)),
+    'CSS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
+    'JS_COMPRESSOR': None,
+    'DISABLE_WRAPPER': True,
+    'STYLESHEETS': {
         "all": {"source_filenames": (
             "compile_bootstrap.less",
             "bootstrap/dist/css/bootstrap-theme.css",
@@ -188,8 +187,8 @@ PIPELINE_CSS = {
         ),
             "output_filename": "all.css",
         }
-}
-PIPELINE_JS = {
+    },
+    'JAVASCRIPT': {
         "all": {"source_filenames": (
             # "jquery/dist/jquery.js",  # included separately
             "bootbox/bootbox.js",
@@ -251,10 +250,10 @@ PIPELINE_JS = {
         ),
             "output_filename": "datastore.js",
         },
+    },
 }
 
 
-
 ########## SECRET CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
 # Note: This key should only be used for development and testing.
@@ -278,26 +277,31 @@ FIXTURE_DIRS = (
 
 
 ########## TEMPLATE CONFIGURATION
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
-TEMPLATE_CONTEXT_PROCESSORS = (
+
+# See: https://docs.djangoproject.com/en/dev/ref/settings/#TEMPLATES
+TEMPLATES = [{
+    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+    'DIRS' : (
+        normpath(join(SITE_ROOT, '../../site-circle/templates')),
+        normpath(join(SITE_ROOT, 'templates')),
+    ),
+    'APP_DIRS': True,
+    'OPTIONS': {
+        'context_processors': (
             'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.media',
-    'django.core.context_processors.static',
-    'django.core.context_processors.tz',
+            'django.template.context_processors.debug',
+            'django.template.context_processors.i18n',
+            'django.template.context_processors.media',
+            'django.template.context_processors.static',
+            'django.template.context_processors.tz',
             'django.contrib.messages.context_processors.messages',
-    'django.core.context_processors.request',
+            'django.template.context_processors.request',
             'dashboard.context_processors.notifications',
             'dashboard.context_processors.extract_settings',
             'dashboard.context_processors.broadcast_messages',
-)
-
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
-TEMPLATE_DIRS = (
-    normpath(join(SITE_ROOT, '../../site-circle/templates')),
-    normpath(join(SITE_ROOT, 'templates')),
-)
+        ),
+    },
+}]
 ########## END TEMPLATE CONFIGURATION
 
 
@@ -347,7 +351,8 @@ THIRD_PARTY_APPS = (
     'taggit',
     'statici18n',
     'django_sshkey',
-    'autocomplete_light',
+    'dal',
+    'dal_select2',
     'pipeline',
 )
 

circle/circle/settings/local.py

@@ -27,7 +27,7 @@ from base import *  # noqa
 DEBUG = True
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
-TEMPLATE_DEBUG = DEBUG
+TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
 ########## END DEBUG CONFIGURATION
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
@@ -110,8 +110,10 @@ if DEBUG:
     from django.dispatch import Signal
     Signal.send_robust = Signal.send
 
-PIPELINE_COMPILERS = (
+PIPELINE["COMPILERS"] = (
     'dashboard.compilers.DummyLessCompiler',
 )
 
 ADMIN_ENABLED = True
+
+ALLOWED_HOSTS = ['*']

circle/circle/settings/test.py

@@ -38,7 +38,11 @@ INSTALLED_APPS += (
     'django_nose',
 )
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-NOSE_ARGS = ['--with-doctest', '--exclude-dir=dashboard/tests/selenium']
+NOSE_ARGS = [
+    '--with-doctest',
+    '--exclude-dir=dashboard/tests/selenium',
+    '--exclude=circle'
+]
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 
 CACHES = {
@@ -59,7 +63,7 @@ for i in LOCAL_APPS:
 
 # don't print SQL queries
 LOGGING['handlers']['null'] = {'level': "DEBUG",
-                               'class': "django.utils.log.NullHandler"}
+                               'class': "logging.NullHandler"}
 LOGGING['loggers']['django.db.backends'] = {
     'handlers': ['null'],
     'propagate': False,