Django 1.9 compatibility

5 files changed, 14 insertions, 10 deletions

diff --git a/omaha_server/omaha/limitation.py b/omaha_server/omaha/limitation.py
index 21ff549..4f12281 100644
--- a/omaha_server/omaha/limitation.py
+++ b/omaha_server/omaha/limitation.py
@@ -3,7 +3,7 @@ import operator
 import time
 import logging
 
-from django.db.models.loading import get_model
+from django.apps import apps
 from django.utils import timezone
 from django.conf import settings
 from django.db.models import Count
@@ -128,7 +128,7 @@ def delete_older_than(app, model_name, limit=None):
     if not limit:
         preference_key = '__'.join([model_name, 'limit_storage_days'])
         limit = gpm[preference_key]
-    model = get_model(app, model_name)
+    model = apps.get_model(app, model_name)
     offset = timezone.timedelta(days=limit)
     limit = timezone.now() - offset
     old_objects = model.objects.filter(created__lte=limit)
@@ -170,7 +170,7 @@ def delete_size_is_exceeded(app, model_name, limit=None):
         limit = gpm[preference_key] * 1024 * 1024 * 1024
     else:
         limit *= 1024*1024*1024
-    model = get_model(app, model_name)
+    model = apps.get_model(app, model_name)
     group_count = 1000
     full_result = dict(count=0, size=0, elements=[])
     objects_size = model.objects.get_size()
diff --git a/omaha_server/omaha/tests/test_models.py b/omaha_server/omaha/tests/test_models.py
index 146fa5d..92e2392 100644
--- a/omaha_server/omaha/tests/test_models.py
+++ b/omaha_server/omaha/tests/test_models.py
@@ -30,6 +30,8 @@ from omaha.tests.utils import temporary_media_root
 
 
 class ApplicationModelTest(test.SimpleTestCase):
+    allow_database_queries = True
+
     def test_factory(self):
         app = ApplicationFactory.create()
         self.assertTrue(Application.objects.get(id=app.id))
diff --git a/omaha_server/omaha/tests/test_public.py b/omaha_server/omaha/tests/test_public.py
index 538a543..abca7ac 100644
--- a/omaha_server/omaha/tests/test_public.py
+++ b/omaha_server/omaha/tests/test_public.py
@@ -1,7 +1,6 @@
 
 import os
 from lxml import objectify
-import logging
 
 from django.test import LiveServerTestCase, override_settings
 from django.core.files.uploadedfile import SimpleUploadedFile
diff --git a/omaha_server/omaha_server/settings.py b/omaha_server/omaha_server/settings.py
index 1357d18..abd5da0 100644
--- a/omaha_server/omaha_server/settings.py
+++ b/omaha_server/omaha_server/settings.py
@@ -28,6 +28,8 @@ if os.getenv('OMAHA_ONLY_HTTPS'):
     SECURE_REDIRECT_EXEMPT = [
         r"^healthcheck/status/$"
     ]
+    
+SITE_ID = 1
 
 TEMPLATES = [
     {
@@ -37,10 +39,10 @@ TEMPLATES = [
         ],
         'APP_DIRS': True,
         'OPTIONS': {
-            'context_processors': TCP + (
+            'context_processors': TCP + [
                 'django.core.context_processors.request',
                 'absolute.context_processors.absolute',
-            ),
+            ],
         },
     },
 ]
@@ -91,6 +93,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.sites',
 
     'storages',
     'django_extensions',
diff --git a/requirements/base.txt b/requirements/base.txt
index 90d9ddb..0e59dcc 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,6 +1,6 @@
 six==1.10.0
 future==0.15.2
-Django==1.8.6
+django==1.9
 django-extensions==1.5.9
 django-suit==0.2.15
 django-suit-redactor==0.0.2
@@ -16,7 +16,7 @@ singledispatch==3.4.0.3
 django-bower==5.0.4
 django-nvd3==0.9.4
 django-filter==0.11.0
-celery[redis]==3.1.18
+celery[redis]==3.1.19
 django-cacheops==2.4.3
 msgpack-python==0.4.6
 django-tables2==1.0.4
@@ -26,11 +26,11 @@ django-ace==1.0.2
 djangorestframework==3.3.1
 Markdown==2.6.2
 pytz==2015.7
-Django-Select2==5.3.1
+Django-Select2==5.4.2
 django-bootstrap3==6.2.2
 protobuf==3.0.0a3
 protobuf-to-dict==0.1.0
-django-dynamic-preferences==0.6.1
+django-dynamic-preferences==0.6.2
 
 # Only dev
 #django-httplog==0.2.3