feat(*): update django from 1.7 to 1.8

Author: helgi

rootfs/api/fields.py

@@ -3,53 +3,8 @@
 """
 
 from __future__ import unicode_literals
-from uuid import uuid4
-
-from django import forms
 from django.db import models
 
 
-class UuidField(models.CharField):
-    """A univerally unique ID field."""
-
-    description = __doc__
-
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('auto_created', True)
-        kwargs.setdefault('editable', False)
-        kwargs.setdefault('max_length', 32)
-        kwargs.setdefault('unique', True)
-        super(UuidField, self).__init__(*args, **kwargs)
-
-    def db_type(self, connection=None):
-        """Return the database column type for a UuidField."""
-        if connection and 'postgres' in connection.vendor:
-            return 'uuid'
-        else:
-            return "char({})".format(self.max_length)
-
-    def pre_save(self, model_instance, add):
-        """Initialize an empty field with a new UUID before it is saved."""
-        value = getattr(model_instance, self.get_attname(), None)
-        if not value and add:
-            uuid = str(uuid4())
-            setattr(model_instance, self.get_attname(), uuid)
-            return uuid
-        else:
-            return super(UuidField, self).pre_save(model_instance, add)
-
-    def formfield(self, **kwargs):
-        """Tell forms how to represent this UuidField."""
-        kwargs.update({
-            'form_class': forms.CharField,
-            'max_length': self.max_length,
-        })
-        return super(UuidField, self).formfield(**kwargs)
-
-
-try:
-    from south.modelsinspector import add_introspection_rules
-    # Tell the South schema migration tool to handle our custom fields.
-    add_introspection_rules([], [r'^api\.fields\.UuidField'])
-except ImportError:  # pragma: no cover
+class UuidField(models.UUIDField):
     pass

rootfs/api/migrations/0002_auto_20151215_0352.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import api.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='app',
+            name='id',
+            field=models.SlugField(max_length=24, unique=True, null=True, validators=[api.models.validate_id_is_docker_compatible, api.models.validate_reserved_names]),
+        ),
+        migrations.AlterField(
+            model_name='app',
+            name='uuid',
+            field=models.UUIDField(serialize=False, verbose_name='UUID', primary_key=True),
+        ),
+        migrations.AlterField(
+            model_name='build',
+            name='uuid',
+            field=models.UUIDField(serialize=False, verbose_name='UUID', primary_key=True),
+        ),
+        migrations.AlterField(
+            model_name='config',
+            name='uuid',
+            field=models.UUIDField(serialize=False, verbose_name='UUID', primary_key=True),
+        ),
+        migrations.AlterField(
+            model_name='container',
+            name='uuid',
+            field=models.UUIDField(serialize=False, verbose_name='UUID', primary_key=True),
+        ),
+        migrations.AlterField(
+            model_name='key',
+            name='uuid',
+            field=models.UUIDField(serialize=False, verbose_name='UUID', primary_key=True),
+        ),
+        migrations.AlterField(
+            model_name='push',
+            name='uuid',
+            field=models.UUIDField(serialize=False, verbose_name='UUID', primary_key=True),
+        ),
+        migrations.AlterField(
+            model_name='release',
+            name='uuid',
+            field=models.UUIDField(serialize=False, verbose_name='UUID', primary_key=True),
+        ),
+    ]

rootfs/api/models.py

@@ -13,6 +13,7 @@
 import re
 import time
 import json
+import uuid
 from threading import Thread
 
 from django.conf import settings
@@ -28,7 +29,7 @@
 import requests
 from rest_framework.authtoken.models import Token
 
-from api import fields, utils, exceptions
+from api import utils, exceptions
 from registry import publish_release
 from utils import dict_diff, dict_merge, fingerprint
 
@@ -129,7 +130,12 @@ class Meta:
 class UuidAuditedModel(AuditedModel):
     """Add a UUID primary key to an :class:`AuditedModel`."""
 
-    uuid = fields.UuidField('UUID', primary_key=True)
+    uuid = models.UUIDField('UUID',
+                            default=uuid.uuid4,
+                            primary_key=True,
+                            editable=False,
+                            auto_created=True,
+                            unique=True)
 
     class Meta:
         """Mark :class:`UuidAuditedModel` as abstract."""
@@ -155,7 +161,6 @@ class Meta:
     def select_app_name(self):
         """Select a unique randomly generated app name"""
         name = utils.generate_app_name()
-
         while App.objects.filter(id=name).exists():
             name = utils.generate_app_name()
 
@@ -767,7 +772,7 @@ def save(self, **kwargs):
         return super(Build, self).save(**kwargs)
 
     def __str__(self):
-        return "{0}-{1}".format(self.app.id, self.uuid[:7])
+        return "{0}-{1}".format(self.app.id, str(self.uuid)[:7])
 
 
 @python_2_unicode_compatible
@@ -790,7 +795,7 @@ class Meta:
         unique_together = (('app', 'uuid'),)
 
     def __str__(self):
-        return "{}-{}".format(self.app.id, self.uuid[:7])
+        return "{}-{}".format(self.app.id, str(self.uuid)[:7])
 
     def save(self, **kwargs):
         """merge the old config with the new"""

rootfs/api/tests/__init__.py

@@ -1,37 +1,11 @@
-
 from __future__ import unicode_literals
 import logging
 
-from django.test.client import RequestFactory, Client
-from django.test.simple import DjangoTestSuiteRunner
+from django.test.runner import DiscoverRunner
 import requests
 
 
-# add patch support to built-in django test client
-
-def construct_patch(self, path, data='',
-                    content_type='application/octet-stream', **extra):
-    """Construct a PATCH request."""
-    return self.generic('PATCH', path, data, content_type, **extra)
-
-
-def send_patch(self, path, data='', content_type='application/octet-stream',
-               follow=False, **extra):
-    """Send a resource to the server using PATCH."""
-    # FIXME: figure out why we need to reimport Client (otherwise NoneType)
-    from django.test.client import Client  # @Reimport
-    response = super(Client, self).patch(
-        path, data=data, content_type=content_type, **extra)
-    if follow:
-        response = self._handle_redirects(response, **extra)
-    return response
-
-
-RequestFactory.patch = construct_patch
-Client.patch = send_patch
-
-
-class SilentDjangoTestSuiteRunner(DjangoTestSuiteRunner):
+class SilentDjangoTestSuiteRunner(DiscoverRunner):
     """Prevents api log messages from cluttering the console during tests."""
 
     def run_tests(self, test_labels, extra_tests=None, **kwargs):

rootfs/api/tests/test_app.py

@@ -79,7 +79,7 @@ def test_app_override_id(self):
         response = self.client.post('/v2/apps', json.dumps(body),
                                     content_type='application/json',
                                     HTTP_AUTHORIZATION='token {}'.format(self.token))
-        self.assertContains(response, 'This field must be unique.', status_code=400)
+        self.assertContains(response, 'App with this id already exists.', status_code=400)
         return response
 
     @mock.patch('requests.get')

rootfs/api/tests/test_build.py

@@ -48,7 +48,7 @@ def test_build(self):
         response = self.client.post(url, json.dumps(body), content_type='application/json',
                                     HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 201)
-        build_id = response.data['uuid']
+        build_id = str(response.data['uuid'])
         build1 = response.data
         self.assertEqual(response.data['image'], body['image'])
         # read the build
@@ -203,7 +203,7 @@ def test_build_str(self):
         self.assertEqual(response.status_code, 201)
         build = Build.objects.get(uuid=response.data['uuid'])
         self.assertEqual(str(build), "{}-{}".format(
-                         response.data['app'], response.data['uuid'][:7]))
+                         response.data['app'], str(response.data['uuid'])[:7]))
 
     @mock.patch('requests.post', mock_status_ok)
     def test_admin_can_create_builds_on_other_apps(self):
@@ -225,7 +225,7 @@ def test_admin_can_create_builds_on_other_apps(self):
         self.assertEqual(response.status_code, 201)
         build = Build.objects.get(uuid=response.data['uuid'])
         self.assertEqual(str(build), "{}-{}".format(
-                         response.data['app'], response.data['uuid'][:7]))
+                         response.data['app'], str(response.data['uuid'])[:7]))
 
     @mock.patch('requests.post', mock_status_ok)
     def test_unauthorized_user_cannot_modify_build(self):

rootfs/api/tests/test_config.py

@@ -250,7 +250,7 @@ def test_config_str(self):
         """Test the text representation of a node."""
         config5 = self.test_config()
         config = Config.objects.get(uuid=config5['uuid'])
-        self.assertEqual(str(config), "{}-{}".format(config5['app'], config5['uuid'][:7]))
+        self.assertEqual(str(config), "{}-{}".format(config5['app'], str(config5['uuid'])[:7]))
 
     @mock.patch('requests.post', mock_status_ok)
     def test_valid_config_keys(self):

rootfs/api/tests/test_hooks.py

@@ -166,10 +166,9 @@ def test_build_hook_dockerfile(self):
         build = {'username': 'autotest', 'app': app_id}
         url = '/v2/hooks/builds'.format(**locals())
         SHA = 'ecdff91c57a0b9ab82e89634df87e293d259a3aa'
-        DOCKERFILE = """
-        FROM busybox
-        CMD /bin/true
-        """
+        DOCKERFILE = """FROM busybox
+        CMD /bin/true"""
+
         body = {'receive_user': 'autotest',
                 'receive_repo': app_id,
                 'image': '{app_id}:v2'.format(**locals()),

rootfs/api/urls.py

@@ -5,16 +5,16 @@
 from __future__ import unicode_literals
 
 from django.conf import settings
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 
 from api import routers, views
+from rest_framework.authtoken.views import obtain_auth_token as views_obtain_auth_token
 
 
 router = routers.ApiRouter()
 
 # Add the generated REST URLs and login/logout endpoint
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^', include(router.urls)),
     # application release components
     url(r"^apps/(?P<id>{})/config/?".format(settings.APP_URL_REGEX),
@@ -86,7 +86,7 @@
     url(r'^auth/passwd/?',
         views.UserManagementViewSet.as_view({'post': 'passwd'})),
     url(r'^auth/login/',
-        'rest_framework.authtoken.views.obtain_auth_token'),
+        views_obtain_auth_token),
     url(r'^auth/tokens/',
         views.TokenManagementViewSet.as_view({'post': 'regenerate'})),
     # admin sharing
@@ -100,4 +100,4 @@
         views.CertificateViewSet.as_view({'get': 'list', 'post': 'create'})),
     # list users
     url(r'^users/', views.UserView.as_view({'get': 'list'})),
-)
+]

rootfs/api/views.py

@@ -190,9 +190,11 @@ def list(self, request, *args, **kwargs):
         instance = self.filter_queryset(queryset)
         page = self.paginate_queryset(instance)
         if page is not None:
-            serializer = self.get_pagination_serializer(page)
-        else:
-            serializer = self.get_serializer(instance, many=True)
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(instance, many=True)
+
         return Response(serializer.data)
 
     def post_save(self, app):