Merge pull request #196 from Crystalnix/dev

Django 1.9 + Updates of AWS Beanstalk

13 files changed, 70 insertions, 44 deletions

diff --git a/deploy/main.py b/deploy/main.py
index 3ef2a1c..d83161b 100755
--- a/deploy/main.py
+++ b/deploy/main.py
@@ -31,7 +31,7 @@ SETTINGS_PATH = os.path.join(BASE_DIR, 'settings.yml')
 DEFAULT_SETTINGS = dict(
     app=dict(
         versions_to_keep=10,
-        solution_stack_name='64bit Amazon Linux 2015.03 v1.4.3 running Docker 1.6.2',
+        solution_stack_name='64bit Amazon Linux 2016.03 v2.1.0 running Docker 1.9.1',
         InstanceType='t2.small',
         autoscaling=dict(min=1, max=10),
         healthcheck_url='/healthcheck/status/',
diff --git a/omaha_server/omaha/dynamic_preferences_registry.py b/omaha_server/omaha/dynamic_preferences_registry.py
index 34c23eb..8f0439b 100644
--- a/omaha_server/omaha/dynamic_preferences_registry.py
+++ b/omaha_server/omaha/dynamic_preferences_registry.py
@@ -25,7 +25,7 @@ from django.forms import IntegerField
 from django.core.validators import MinValueValidator
 
 from dynamic_preferences.types import IntegerPreference, ChoicePreference
-from dynamic_preferences import global_preferences_registry
+from dynamic_preferences.registries import global_preferences_registry
 from django_select2.forms import Select2Widget
 
 class PositiveIntegerField(IntegerField):
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/migrations/0026_grant_permission_django_site.py b/omaha_server/omaha/migrations/0026_grant_permission_django_site.py
new file mode 100644
index 0000000..5ece27f
--- /dev/null
+++ b/omaha_server/omaha/migrations/0026_grant_permission_django_site.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, connection
+from django.conf import settings
+
+
+def grant_permissions(apps, schema_editor):
+    cursor = connection.cursor()
+    cursor.execute('GRANT SELECT ON TABLE django_site TO GROUP %s;' % settings.DB_PUBLIC_ROLE)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('omaha', '0025_auto_20151209_1040'),
+        ('sites', '0001_initial')
+    ]
+
+    operations = [
+        migrations.RunPython(grant_permissions, reverse_code=migrations.RunPython.noop),
+    ]
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 ff5210b..26dcd6f 100644
--- a/omaha_server/omaha_server/settings.py
+++ b/omaha_server/omaha_server/settings.py
@@ -29,6 +29,8 @@ if os.getenv('OMAHA_ONLY_HTTPS'):
         r"^healthcheck/status/$"
     ]
 
+SITE_ID = 1
+
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -37,10 +39,10 @@ TEMPLATES = [
         ],
         'APP_DIRS': True,
         'OPTIONS': {
-            'context_processors': TCP + (
+            'context_processors': TCP + [
                 'django.core.context_processors.request',
                 'absolute.context_processors.absolute',
-            ),
+            ],
         },
     },
 ]
@@ -50,7 +52,7 @@ APP_VERSION = "0.3.9"
 SUIT_CONFIG = {
     'ADMIN_NAME': 'Omaha Server [{}]'.format(APP_VERSION),
     'MENU': (
-        'sites',
+        # 'sites',
         {'app': 'omaha', 'label': 'Omaha', 'icon': 'icon-refresh'},
         {'app': 'sparkle', 'label': 'Sparkle', 'icon': 'icon-circle-arrow-down'},
         {'app': 'crash', 'label': 'Crash reports', 'icon': 'icon-fire'},
@@ -91,6 +93,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.sites',
 
     'storages',
     'django_extensions',
diff --git a/omaha_server/omaha_server/settings_local.py b/omaha_server/omaha_server/settings_local.py
index d19133a..c65c9c6 100644
--- a/omaha_server/omaha_server/settings_local.py
+++ b/omaha_server/omaha_server/settings_local.py
@@ -14,7 +14,7 @@ STATIC_URL = '/static/'
 SITE_ID = 1
 
 INSTALLED_APPS += (
-    'debug_toolbar.apps.DebugToolbarConfig',
+    'debug_toolbar',
     'debug_panel',
     'httplog',
 )
diff --git a/pavement.py b/pavement.py
index 769089f..5b459c2 100644
--- a/pavement.py
+++ b/pavement.py
@@ -82,6 +82,7 @@ def loaddata():
 
 @task
 def migrate():
+    sh('./manage.py migrate sites --noinput', cwd='omaha_server')
     sh('./manage.py migrate auth --noinput', cwd='omaha_server')
     sh('./manage.py migrate --noinput', cwd='omaha_server')
 
diff --git a/requirements/base.txt b/requirements/base.txt
index 90d9ddb..a99974c 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,36 +1,36 @@
 six==1.10.0
 future==0.15.2
-Django==1.8.6
-django-extensions==1.5.9
-django-suit==0.2.15
-django-suit-redactor==0.0.2
+django==1.9.6
+django-extensions==1.6.7
+django-suit==0.2.18
+django-suit-redactor==0.0.4
 jsonfield==1.0.3
-boto==2.38.0
-django-storages==1.1.8
+boto==2.40.0
+django-storages==1.4.1
 django-absolute==0.3
 django-versionfield3==0.1.1
-raven==5.8.1
-django-redis==4.3.0
-bitmapist==3.9
+raven==5.17.0
+django-redis==4.4.3
+bitmapist==3.97
 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
+django-bower==5.1.0
+django-nvd3==0.9.7
+django-filter==0.13.0
+celery[redis]==3.1.23
 django-cacheops==2.4.3
-msgpack-python==0.4.6
-django-tables2==1.0.4
+msgpack-python==0.4.7
+django-tables2==1.2.1
 clom==0.8.0a1
-furl==0.4.8
+furl==0.4.93
 django-ace==1.0.2
-djangorestframework==3.3.1
-Markdown==2.6.2
-pytz==2015.7
-Django-Select2==5.3.1
-django-bootstrap3==6.2.2
+djangorestframework==3.3.3
+Markdown==2.6.6
+pytz==2016.4
+Django-Select2==5.8.4
+django-bootstrap3==7.0.1
 protobuf==3.0.0a3
 protobuf-to-dict==0.1.0
-django-dynamic-preferences==0.6.1
+django-dynamic-preferences==0.8.1
 
 # Only dev
 #django-httplog==0.2.3
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 3b5c613..23ccb70 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,8 +1,8 @@
 -r test.txt
 
-lxml==3.5.0
+lxml==3.6.0
 django-debug-toolbar==1.4
 django-debug-panel==0.8.2
 ebs-deploy==1.9.9
 bumpversion==0.5.3
-Pillow==3.0.0
+Pillow==3.2.0
diff --git a/requirements/test.txt b/requirements/test.txt
index 68f0667..dadf95a 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,16 +1,16 @@
 -r base.txt
 
 Paver==1.2.4
-django-nose==1.4.2
+django-nose==1.4.3
 nose==1.3.7
 nose-progressive==1.5.1
-xmlunittest==0.3.1
+xmlunittest==0.3.2
 coverage==3.7.1
-coveralls==0.5
-freezegun==0.3.5
-factory-boy==2.6.0
-mock==1.3.0
-tox==2.2.1
-pyquery==1.2.9
+coveralls==1.1
+freezegun==0.3.7
+factory-boy==2.7.0
+mock==2.0.0
+tox==2.3.1
+pyquery==1.2.13
 psycopg2==2.6.1
-moto==0.4.12
+moto==0.4.24
diff --git a/tox.ini b/tox.ini
index b4d22b1..7105e08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [base]
-passenv = PATH_TO_TEST DJANGO_SETTINGS_MODULE OMAHA_SERVER_PRIVATE HOST_NAME SECRET_KEY REDIS_HOST DB_HOST
+passenv = PATH_TO_TEST DJANGO_SETTINGS_MODULE OMAHA_SERVER_PRIVATE HOST_NAME SECRET_KEY REDIS_HOST DB_HOST TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 commands =
   paver test_tox
 deps =