Move to using Django 1.7

Also fix the settings system to use local_settings.py instead.
vikoivun · Jan 19, 2015 · 2595323 · 2595323
1 parent 2d903a8
commit 2595323
Show file tree

Hide file tree

Showing 18 changed files with 412 additions and 2,467 deletions.
diff --git a/events/admin.py b/events/admin.py
@@ -40,11 +40,3 @@ class LanguageAdmin(BaseAdmin, reversion.VersionAdmin):
 
 class PersonAdmin(BaseAdmin, reversion.VersionAdmin):
     pass
-
-
-admin.site.register(Event, EventModelAdmin)
-admin.site.register(KeywordLabel)
-admin.site.register(Keyword, KeywordAdmin)
-admin.site.register(Place, PlaceAdmin)
-admin.site.register(Language, LanguageAdmin)
-admin.site.register(OpeningHoursSpecification)
diff --git a/events/migrations/0001_initial.py b/events/migrations/0001_initial.py
diff --git a/...migrations/0002_auto__add_field_event_short_description__add_field_event_short_descrip.py b/...migrations/0002_auto__add_field_event_short_description__add_field_event_short_descrip.py
diff --git a/events/migrations/0003_auto__chg_field_exportinfo_object_id.py b/events/migrations/0003_auto__chg_field_exportinfo_object_id.py
diff --git a/events/migrations/0004_auto__add_field_event_headline__add_field_event_secondary_headline.py b/events/migrations/0004_auto__add_field_event_headline__add_field_event_secondary_headline.py
diff --git a/...migrations/0005_auto__add_field_event_headline_fi__add_field_event_headline_sv__add_fi.py b/...migrations/0005_auto__add_field_event_headline_fi__add_field_event_headline_sv__add_fi.py
diff --git a/events/migrations/0006_auto__add_offer.py b/events/migrations/0006_auto__add_offer.py
diff --git a/events/migrations/0007_auto__add_eventaggregatemember__add_eventaggregate.py b/events/migrations/0007_auto__add_eventaggregatemember__add_eventaggregate.py
diff --git a/events/migrations/0008_auto__add_field_event_is_recurring_super.py b/events/migrations/0008_auto__add_field_event_is_recurring_super.py
diff --git a/events/models.py b/events/models.py
@@ -28,7 +28,6 @@
 from django.utils.translation import ugettext_lazy as _
 from mptt.models import MPTTModel, TreeForeignKey
 from django.contrib.contenttypes.models import ContentType
-from events import contexts
 from events import translation_utils
 from django.utils.encoding import python_2_unicode_compatible
 
@@ -332,11 +331,11 @@ def save(self, *args, **kwargs):
         self.last_exported_time = BaseModel.now()
         super(ExportInfo, self).save(*args, **kwargs)
 
+
 class EventAggregate(models.Model):
     super_event = models.OneToOneField(Event, related_name='aggregate', null=True)
+
+
 class EventAggregateMember(models.Model):
     event_aggregate = models.ForeignKey(EventAggregate, related_name='members')
     event = models.ForeignKey(Event, unique=True)
-
-contexts.create_context(Event)
-contexts.create_context(Place)
diff --git a/linkedevents/settings/base.py → linkedevents/settings.py b/linkedevents/settings/base.py → linkedevents/settings.py
@@ -10,7 +10,18 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': 'linkedevents',
+        'USER': 'linkedevents',
+        'PASSWORD': 'linkedevents',
+        'HOST': 'localhost',
+        'PORT': '',
+    }
+}
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
@@ -19,9 +30,9 @@
 SECRET_KEY = '%ad7)k=_a6l4-@263z(@@xbz81fl(cz&#bq_7l&!i92yxs2-vh'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
-TEMPLATE_DEBUG = True
+TEMPLATE_DEBUG = False
 
 ALLOWED_HOSTS = []
 
@@ -37,7 +48,6 @@
     'django.contrib.staticfiles',
     'django.contrib.gis',
     'django_extensions',
-    'south',
     'corsheaders',
     'rest_framework',
     'django_hstore',
@@ -72,9 +82,6 @@
 
 DATABASES = {}
 
-# Keep the database connection open for 120s
-CONN_MAX_AGE = 120
-
 ATOMIC_REQUESTS = True
 
 # Internationalization
@@ -209,3 +216,10 @@
 
 #from multilingual_haystack.settings import get_haystack_connections
 #HAYSTACK_CONNECTIONS = get_haystack_connections(HAYSTACK_CONNECTIONS, LANGUAGES)
+
+# local_settings.py can be used to override environment-specific settings
+# like database and email that differ between development and production.
+try:
+    from local_settings import *
+except ImportError:
+    pass
diff --git a/linkedevents/settings/__init__.py b/linkedevents/settings/__init__.py
diff --git a/linkedevents/settings/cd.py b/linkedevents/settings/cd.py
diff --git a/linkedevents/settings/dev.py b/linkedevents/settings/dev.py
diff --git a/linkedevents/settings/prod.py b/linkedevents/settings/prod.py
diff --git a/linkedevents/settings/test.py b/linkedevents/settings/test.py
diff --git a/manage.py b/manage.py
@@ -3,11 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    if 'test' in sys.argv:
-        os.environ.setdefault("DJANGO_SETTINGS_MODULE", "linkedevents.settings.test")
-    else:
-        os.environ.setdefault("DJANGO_SETTINGS_MODULE", "linkedevents.settings.dev")
-
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "linkedevents.settings")
     from django.core.management import execute_from_command_line
 
     execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django<1.7
+Django
 Markdown
 PyYAML
 South
@@ -8,7 +8,7 @@ django-hstore
 django-modeltranslation
 django-mptt
 django-reversion
-djangorestframework==2.3.14
+djangorestframework<3.0
 djangorestframework-gis
 lxml
 isodate