From 5e86c24c21136291aad91fab2ca455d4cf2b7418 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Tue, 25 Oct 2016 12:30:28 +0100
Subject: [PATCH 01/10] Convert AbstractMedia.search_fields to list

---
 setup.py               | 2 +-
 wagtailmedia/models.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index a89b8c80..d36a34b1 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@
     ],
     install_requires=[
         'Django>=1.8.1,<1.10',
-        'wagtail>=1.4',
+        'wagtail>=1.5.3',
     ],
     extras_require={
         'testing': testing_extras,
diff --git a/wagtailmedia/models.py b/wagtailmedia/models.py
index b07886d9..d4d6e081 100644
--- a/wagtailmedia/models.py
+++ b/wagtailmedia/models.py
@@ -55,9 +55,9 @@ class AbstractMedia(CollectionMember, TagSearchable):
 
     objects = MediaQuerySet.as_manager()
 
-    search_fields = TagSearchable.search_fields + CollectionMember.search_fields + (
+    search_fields = TagSearchable.search_fields + CollectionMember.search_fields + [
         index.FilterField('uploaded_by_user'),
-    )
+    ]
 
     def __str__(self):
         return self.title

From 4eed0cd97304a4f5e00be1d65858a1bd64706af4 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 10:53:24 +0100
Subject: [PATCH 02/10] Add .button class to buttons in admin Fixes #3

---
 wagtailmedia/templates/wagtailmedia/media/add.html            | 2 +-
 wagtailmedia/templates/wagtailmedia/media/confirm_delete.html | 2 +-
 wagtailmedia/templates/wagtailmedia/media/edit.html           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtailmedia/templates/wagtailmedia/media/add.html b/wagtailmedia/templates/wagtailmedia/media/add.html
index 79f2a718..4cde251e 100644
--- a/wagtailmedia/templates/wagtailmedia/media/add.html
+++ b/wagtailmedia/templates/wagtailmedia/media/add.html
@@ -38,7 +38,7 @@
                     {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
                 {% endfor %}
                 <li>
-                    <button type="submit" class="button-longrunning" data-clicked-text="{% trans 'Uploading...' %}"><span class="icon icon-spinner"></span><em>{% trans 'Upload' %}</em></button>
+                    <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Uploading...' %}"><span class="icon icon-spinner"></span><em>{% trans 'Upload' %}</em></button>
                 </li>
             </ul>
         </form>
diff --git a/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html b/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html
index 21140d9f..74f293fe 100644
--- a/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html
+++ b/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html
@@ -9,7 +9,7 @@
         <p>{% trans "Are you sure you want to delete this media file?" %}</p>
         <form action="{% url 'wagtailmedia:delete' media.id %}" method="POST">
             {% csrf_token %}
-            <input type="submit" value='{% trans "Yes, delete" %}' class="serious" />
+            <input type="submit" value='{% trans "Yes, delete" %}' class="button serious" />
         </form>
     </div>
 {% endblock %}
diff --git a/wagtailmedia/templates/wagtailmedia/media/edit.html b/wagtailmedia/templates/wagtailmedia/media/edit.html
index 17e91d40..bdeb15f5 100644
--- a/wagtailmedia/templates/wagtailmedia/media/edit.html
+++ b/wagtailmedia/templates/wagtailmedia/media/edit.html
@@ -36,7 +36,7 @@
                         {% endif %}
                     {% endfor %}
                     <li>
-                        <input type="submit" value="{% trans 'Save' %}" />
+                        <input class="button" type="submit" value="{% trans 'Save' %}" />
                         {% if user_can_delete %}
                             <a href="{% url 'wagtailmedia:delete' media.id %}" class="button button-secondary no">{% trans "Delete" %}</a>
                         {% endif %}

From 0e86e35c381fca6f54223374fd67b695dd13dc97 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 13:39:19 +0100
Subject: [PATCH 03/10] Disable HTML5 form validation Fixes #4

---
 .../templates/wagtailmedia/chooser/chooser.html      |  2 +-
 wagtailmedia/templates/wagtailmedia/media/add.html   |  2 +-
 .../templates/wagtailmedia/media/confirm_delete.html |  2 +-
 wagtailmedia/templates/wagtailmedia/media/edit.html  |  2 +-
 wagtailmedia/templates/wagtailmedia/media/index.html |  4 ++--
 wagtailmedia/tests/test_views.py                     | 12 ++++++------
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wagtailmedia/templates/wagtailmedia/chooser/chooser.html b/wagtailmedia/templates/wagtailmedia/chooser/chooser.html
index 50fb71dd..55d09af7 100644
--- a/wagtailmedia/templates/wagtailmedia/chooser/chooser.html
+++ b/wagtailmedia/templates/wagtailmedia/chooser/chooser.html
@@ -5,7 +5,7 @@
 
 <div class="tab-content">
     <section id="search" class="{% if not uploadform.errors %}active {% endif %}nice-padding">
-        <form class="media-search search-bar" action="{% url 'wagtailmedia:chooser' %}" method="GET">
+        <form class="media-search search-bar" action="{% url 'wagtailmedia:chooser' %}" method="GET" novalidate>
             <ul class="fields">
                 {% for field in searchform %}
                     {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
diff --git a/wagtailmedia/templates/wagtailmedia/media/add.html b/wagtailmedia/templates/wagtailmedia/media/add.html
index 4cde251e..c5632e3f 100644
--- a/wagtailmedia/templates/wagtailmedia/media/add.html
+++ b/wagtailmedia/templates/wagtailmedia/media/add.html
@@ -31,7 +31,7 @@
     {% include "wagtailadmin/shared/header.html" with title=add_str icon="media" %}
 
     <div class="nice-padding">
-        <form action="{% url 'wagtailmedia:add' media_type %}" method="POST" enctype="multipart/form-data">
+        <form action="{% url 'wagtailmedia:add' media_type %}" method="POST" enctype="multipart/form-data" novalidate>
             {% csrf_token %}
             <ul class="fields">
                 {% for field in form %}
diff --git a/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html b/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html
index 74f293fe..49900531 100644
--- a/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html
+++ b/wagtailmedia/templates/wagtailmedia/media/confirm_delete.html
@@ -7,7 +7,7 @@
 
     <div class="nice-padding">
         <p>{% trans "Are you sure you want to delete this media file?" %}</p>
-        <form action="{% url 'wagtailmedia:delete' media.id %}" method="POST">
+        <form action="{% url 'wagtailmedia:delete' media.id %}" method="POST" novalidate>
             {% csrf_token %}
             <input type="submit" value='{% trans "Yes, delete" %}' class="button serious" />
         </form>
diff --git a/wagtailmedia/templates/wagtailmedia/media/edit.html b/wagtailmedia/templates/wagtailmedia/media/edit.html
index bdeb15f5..c2a7bf2a 100644
--- a/wagtailmedia/templates/wagtailmedia/media/edit.html
+++ b/wagtailmedia/templates/wagtailmedia/media/edit.html
@@ -23,7 +23,7 @@
     <div class="row row-flush nice-padding">
 
         <div class="col10 divider-after">
-            <form action="{% url 'wagtailmedia:edit' media.id %}" method="POST" enctype="multipart/form-data">
+            <form action="{% url 'wagtailmedia:edit' media.id %}" method="POST" enctype="multipart/form-data" novalidate>
                 {% csrf_token %}
                 <ul class="fields">
                     {% for field in form %}
diff --git a/wagtailmedia/templates/wagtailmedia/media/index.html b/wagtailmedia/templates/wagtailmedia/media/index.html
index b7e8d50a..95803415 100644
--- a/wagtailmedia/templates/wagtailmedia/media/index.html
+++ b/wagtailmedia/templates/wagtailmedia/media/index.html
@@ -28,7 +28,7 @@ <h1 class="icon icon-media">
                     {{ media_str }}
                     </h1>
                 </div>
-                <form class="col search-form" action="{% url 'wagtailmedia:index' %}{% if query_parameters %}?{{ query_parameters }}{% endif %}" method="get">
+                <form class="col search-form" action="{% url 'wagtailmedia:index' %}{% if query_parameters %}?{{ query_parameters }}{% endif %}" method="get" novalidate>
                     <ul class="fields">
                         {% for field in search_form %}
                             {% include "wagtailadmin/shared/field_as_li.html" with field=field field_classes="field-small iconfield" input_classes="icon-search" %}
@@ -56,7 +56,7 @@ <h1 class="icon icon-media">
 
     <div class="nice-padding">
         {% if collections %}
-            <form class="image-search search-bar" action="{% url 'wagtailmedia:index' %}" method="GET">
+            <form class="image-search search-bar" action="{% url 'wagtailmedia:index' %}" method="GET" novalidate>
                 <ul class="fields">
                     {% include "wagtailadmin/shared/collection_chooser.html" %}
                 </ul>
diff --git a/wagtailmedia/tests/test_views.py b/wagtailmedia/tests/test_views.py
index 7c1f2558..41152daa 100644
--- a/wagtailmedia/tests/test_views.py
+++ b/wagtailmedia/tests/test_views.py
@@ -110,7 +110,7 @@ def test_get_audio(self):
         self.assertContains(response, 'Add audio')
         self.assertContains(
             response,
-            '<form action="{0}" method="POST" enctype="multipart/form-data">'.format(
+            '<form action="{0}" method="POST" enctype="multipart/form-data" novalidate>'.format(
                 reverse('wagtailmedia:add', args=('audio',))
             ),
             count=1
@@ -123,7 +123,7 @@ def test_get_video(self):
         self.assertContains(response, 'Add video')
         self.assertContains(
             response,
-            '<form action="{0}" method="POST" enctype="multipart/form-data">'.format(
+            '<form action="{0}" method="POST" enctype="multipart/form-data" novalidate>'.format(
                 reverse('wagtailmedia:add', args=('video',))
             ),
             count=1
@@ -146,7 +146,7 @@ def test_get_audio_with_collections(self):
         self.assertContains(response, 'Add audio')
         self.assertContains(
             response,
-            '<form action="{0}" method="POST" enctype="multipart/form-data">'.format(
+            '<form action="{0}" method="POST" enctype="multipart/form-data" novalidate>'.format(
                 reverse('wagtailmedia:add', args=('audio',))
             ),
             count=1
@@ -165,7 +165,7 @@ def test_get_video_with_collections(self):
         self.assertContains(response, 'Add video')
         self.assertContains(
             response,
-            '<form action="{0}" method="POST" enctype="multipart/form-data">'.format(
+            '<form action="{0}" method="POST" enctype="multipart/form-data" novalidate>'.format(
                 reverse('wagtailmedia:add', args=('video',))
             ),
             count=1
@@ -315,7 +315,7 @@ def test_get_audio(self):
         self.assertContains(response, 'Add audio')
         self.assertContains(
             response,
-            '<form action="{0}" method="POST" enctype="multipart/form-data">'.format(
+            '<form action="{0}" method="POST" enctype="multipart/form-data" novalidate>'.format(
                 reverse('wagtailmedia:add', args=('audio',))
             ),
             count=1
@@ -332,7 +332,7 @@ def test_get_video(self):
         self.assertContains(response, 'Add video')
         self.assertContains(
             response,
-            '<form action="{0}" method="POST" enctype="multipart/form-data">'.format(
+            '<form action="{0}" method="POST" enctype="multipart/form-data" novalidate>'.format(
                 reverse('wagtailmedia:add', args=('video',))
             ),
             count=1

From 8fe58a4c05ed07f8a784ca088e1ced5682881412 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 13:40:54 +0100
Subject: [PATCH 04/10] Remove Django dependency

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index d36a34b1..fd7b78bb 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,6 @@
         'Topic :: Internet :: WWW/HTTP :: Site Management',
     ],
     install_requires=[
-        'Django>=1.8.1,<1.10',
         'wagtail>=1.5.3',
     ],
     extras_require={

From 4633e3fdb3f69e70079f9337a4fee54e2a8a7bdd Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 14:04:31 +0100
Subject: [PATCH 05/10] Linting

---
 wagtailmedia/admin.py                  |  3 +--
 wagtailmedia/admin_urls.py             |  3 +--
 wagtailmedia/forms.py                  |  3 ++-
 wagtailmedia/models.py                 | 13 ++++++-------
 wagtailmedia/permissions.py            |  4 +---
 wagtailmedia/tests/settings.py         |  1 -
 wagtailmedia/tests/test_permissions.py |  4 ++--
 wagtailmedia/tests/test_views.py       | 15 +++++----------
 wagtailmedia/tests/testapp/models.py   |  1 -
 wagtailmedia/tests/urls.py             |  2 +-
 wagtailmedia/views/chooser.py          |  3 +--
 wagtailmedia/views/media.py            | 15 ++++++++-------
 wagtailmedia/wagtail_hooks.py          |  9 +++++----
 13 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/wagtailmedia/admin.py b/wagtailmedia/admin.py
index 1b264069..7a10d3fb 100644
--- a/wagtailmedia/admin.py
+++ b/wagtailmedia/admin.py
@@ -1,9 +1,8 @@
-from django.contrib import admin
 from django.conf import settings
+from django.contrib import admin
 
 from wagtailmedia.models import Media
 
-
 if hasattr(settings, 'WAGTAILMEDIA_MEDIA_MODEL') and settings.WAGTAILMEDIA_MEDIA_MODEL != 'wagtailmedia.Media':
     # This installation provides its own custom media class;
     # to avoid confusion, we won't expose the unused wagtailmedia.Media class
diff --git a/wagtailmedia/admin_urls.py b/wagtailmedia/admin_urls.py
index 58270883..b9955048 100644
--- a/wagtailmedia/admin_urls.py
+++ b/wagtailmedia/admin_urls.py
@@ -1,7 +1,6 @@
 from django.conf.urls import url
 
-from wagtailmedia.views import media, chooser
-
+from wagtailmedia.views import chooser, media
 
 urlpatterns = [
     url(r'^$', media.index, name='index'),
diff --git a/wagtailmedia/forms.py b/wagtailmedia/forms.py
index 9a50e748..c8188c05 100644
--- a/wagtailmedia/forms.py
+++ b/wagtailmedia/forms.py
@@ -10,7 +10,8 @@
 )
 
 from wagtailmedia.models import Media
-from wagtailmedia.permissions import permission_policy as media_permission_policy
+from wagtailmedia.permissions import \
+    permission_policy as media_permission_policy
 
 
 class BaseMediaForm(BaseCollectionMemberForm):
diff --git a/wagtailmedia/models.py b/wagtailmedia/models.py
index b07886d9..6e179e24 100644
--- a/wagtailmedia/models.py
+++ b/wagtailmedia/models.py
@@ -2,18 +2,17 @@
 
 import os.path
 
-from taggit.managers import TaggableManager
-
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models.signals import pre_delete
-from django.dispatch.dispatcher import receiver
 from django.dispatch import Signal
-from django.core.urlresolvers import reverse
-from django.core.exceptions import ImproperlyConfigured
-from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.dispatch.dispatcher import receiver
 from django.utils.encoding import python_2_unicode_compatible
+from django.utils.translation import ugettext_lazy as _
 
+from taggit.managers import TaggableManager
 from wagtail.wagtailadmin.taggable import TagSearchable
 from wagtail.wagtailadmin.utils import get_object_usage
 from wagtail.wagtailcore.models import CollectionMember
diff --git a/wagtailmedia/permissions.py b/wagtailmedia/permissions.py
index c82762cc..a990efad 100644
--- a/wagtailmedia/permissions.py
+++ b/wagtailmedia/permissions.py
@@ -1,10 +1,8 @@
-from wagtail.wagtailcore.permission_policies.collections import (
+from wagtail.wagtailcore.permission_policies.collections import \
     CollectionOwnershipPermissionPolicy
-)
 
 from wagtailmedia.models import Media, get_media_model
 
-
 permission_policy = CollectionOwnershipPermissionPolicy(
     get_media_model(),
     auth_model=Media,
diff --git a/wagtailmedia/tests/settings.py b/wagtailmedia/tests/settings.py
index da722312..17fc2b19 100644
--- a/wagtailmedia/tests/settings.py
+++ b/wagtailmedia/tests/settings.py
@@ -1,6 +1,5 @@
 import os
 
-
 WAGTAILMEDIA_ROOT = os.path.dirname(__file__)
 STATIC_ROOT = os.path.join(WAGTAILMEDIA_ROOT, 'test-static')
 MEDIA_ROOT = os.path.join(WAGTAILMEDIA_ROOT, 'test-media')
diff --git a/wagtailmedia/tests/test_permissions.py b/wagtailmedia/tests/test_permissions.py
index fb00f65b..a134619f 100644
--- a/wagtailmedia/tests/test_permissions.py
+++ b/wagtailmedia/tests/test_permissions.py
@@ -5,11 +5,11 @@
 from django.core.files.base import ContentFile
 from django.core.urlresolvers import reverse
 from django.test import TestCase
-from six import b
 
 from wagtail.tests.utils import WagtailTestUtils
-from wagtail.wagtailcore.models import GroupCollectionPermission, Collection
+from wagtail.wagtailcore.models import Collection, GroupCollectionPermission
 
+from six import b
 from wagtailmedia import models
 
 
diff --git a/wagtailmedia/tests/test_views.py b/wagtailmedia/tests/test_views.py
index 7c1f2558..ef8998e4 100644
--- a/wagtailmedia/tests/test_views.py
+++ b/wagtailmedia/tests/test_views.py
@@ -1,23 +1,18 @@
 from __future__ import unicode_literals
 
-import os
-import unittest
-
-import django
-import mock
-
-from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Permission, Group
+from django.contrib.auth.models import Group, Permission
 from django.core.files.base import ContentFile
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
-from six import b
 
 from wagtail.tests.utils import WagtailTestUtils
-from wagtail.wagtailcore.models import Page, Collection, GroupCollectionPermission
+from wagtail.wagtailcore.models import (
+    Collection, GroupCollectionPermission, Page
+)
 
+from six import b
 from wagtailmedia import models
 from wagtailmedia.tests.testapp.models import EventPage, EventPageRelatedMedia
 
diff --git a/wagtailmedia/tests/testapp/models.py b/wagtailmedia/tests/testapp/models.py
index ebc26073..38ba8c8a 100644
--- a/wagtailmedia/tests/testapp/models.py
+++ b/wagtailmedia/tests/testapp/models.py
@@ -1,7 +1,6 @@
 from django.db import models
 
 from modelcluster.fields import ParentalKey
-
 from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel
 from wagtail.wagtailcore.fields import RichTextField
 from wagtail.wagtailcore.models import Orderable, Page
diff --git a/wagtailmedia/tests/urls.py b/wagtailmedia/tests/urls.py
index d5d2df47..8a06525d 100644
--- a/wagtailmedia/tests/urls.py
+++ b/wagtailmedia/tests/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import include, url
 
-from wagtail.wagtailcore import urls as wagtail_urls
 from wagtail.wagtailadmin import urls as wagtailadmin_urls
+from wagtail.wagtailcore import urls as wagtail_urls
 
 urlpatterns = [
     url(r'^admin/', include(wagtailadmin_urls)),
diff --git a/wagtailmedia/views/chooser.py b/wagtailmedia/views/chooser.py
index cd2a2b27..ce260a6f 100644
--- a/wagtailmedia/views/chooser.py
+++ b/wagtailmedia/views/chooser.py
@@ -4,15 +4,14 @@
 from django.shortcuts import get_object_or_404, render
 
 from wagtail.utils.pagination import paginate
-from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
 from wagtail.wagtailadmin.forms import SearchForm
+from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
 from wagtail.wagtailadmin.utils import PermissionPolicyChecker
 from wagtail.wagtailcore.models import Collection
 
 from wagtailmedia.models import get_media_model
 from wagtailmedia.permissions import permission_policy
 
-
 permission_checker = PermissionPolicyChecker(permission_policy)
 
 
diff --git a/wagtailmedia/views/media.py b/wagtailmedia/views/media.py
index 77947922..28b9e0e0 100644
--- a/wagtailmedia/views/media.py
+++ b/wagtailmedia/views/media.py
@@ -1,22 +1,23 @@
 from __future__ import unicode_literals
 
-from django.shortcuts import render, redirect, get_object_or_404
+from django.core.urlresolvers import reverse
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
-from django.core.urlresolvers import reverse
 
 from wagtail.utils.pagination import paginate
-from wagtail.wagtailadmin.forms import SearchForm
-from wagtail.wagtailadmin.utils import PermissionPolicyChecker, permission_denied
-from wagtail.wagtailsearch.backends import get_search_backends
 from wagtail.wagtailadmin import messages
+from wagtail.wagtailadmin.forms import SearchForm
+from wagtail.wagtailadmin.utils import (
+    PermissionPolicyChecker, permission_denied
+)
 from wagtail.wagtailcore.models import Collection
+from wagtail.wagtailsearch.backends import get_search_backends
 
-from wagtailmedia.models import get_media_model
 from wagtailmedia.forms import get_media_form
+from wagtailmedia.models import get_media_model
 from wagtailmedia.permissions import permission_policy
 
-
 permission_checker = PermissionPolicyChecker(permission_policy)
 
 
diff --git a/wagtailmedia/wagtail_hooks.py b/wagtailmedia/wagtail_hooks.py
index 95ee4ef5..f05084ca 100644
--- a/wagtailmedia/wagtail_hooks.py
+++ b/wagtailmedia/wagtail_hooks.py
@@ -1,13 +1,14 @@
 from django.conf.urls import include, url
+from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core import urlresolvers
 from django.utils.html import format_html, format_html_join
-from django.utils.translation import ugettext_lazy as _, ungettext
-from django.contrib.staticfiles.templatetags.staticfiles import static
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext
 
-from wagtail.wagtailcore import hooks
 from wagtail.wagtailadmin.menu import MenuItem
-from wagtail.wagtailadmin.site_summary import SummaryItem
 from wagtail.wagtailadmin.search import SearchArea
+from wagtail.wagtailadmin.site_summary import SummaryItem
+from wagtail.wagtailcore import hooks
 
 from wagtailmedia import admin_urls
 from wagtailmedia.forms import GroupMediaPermissionFormSet

From 46e43f34dd7928c00e06fe1b46f1bc8e9d598965 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 14:06:21 +0100
Subject: [PATCH 06/10] Add .drone.yml and .isort.cfg

---
 .drone.yml | 21 +++++++++++++++++++++
 .isort.cfg |  7 +++++++
 2 files changed, 28 insertions(+)
 create mode 100644 .drone.yml
 create mode 100644 .isort.cfg

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 00000000..fc6a683c
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,21 @@
+build:
+  flake8:
+    image: python:3.5
+    commands:
+      - XDG_CACHE_HOME=/drone/pip-cache pip install flake8
+      - flake8 wagtailmedia
+  isort:
+    image: python:3.5
+    commands:
+      - XDG_CACHE_HOME=/drone/pip-cache pip install -e .[testing]
+      - isort --check-only --diff --recursive wagtailmedia
+  unittest:
+    image: python:3.5
+    commands:
+      - XDG_CACHE_HOME=/drone/pip-cache pip install -e .[testing,docs]
+      - python runtests.py
+
+cache:
+  mount:
+    - node_modules
+    - /drone/pip-cache
diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 00000000..4ef919bf
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,7 @@
+[settings]
+known_first_party=wagtailmedia
+known_django=django
+skip=migrations
+sections=FUTURE, STDLIB, DJANGO, THIRDPARTY, FIRSTPARTY, LOCALFOLDER
+default_section=THIRDPARTY
+multi_line_output=5

From 2ab4e5404bee97cee25944b191974e2ea22939d7 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 14:41:25 +0100
Subject: [PATCH 07/10] Install isort in .drone.yml

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index fc6a683c..d7fe8602 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,6 +8,7 @@ build:
     image: python:3.5
     commands:
       - XDG_CACHE_HOME=/drone/pip-cache pip install -e .[testing]
+      - XDG_CACHE_HOME=/drone/pip-cache pip install isort
       - isort --check-only --diff --recursive wagtailmedia
   unittest:
     image: python:3.5

From 67134d077324baa001dd544feed1d3d58278d62a Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 16:09:07 +0100
Subject: [PATCH 08/10] Move isort config to setup.cfg

---
 .isort.cfg |  7 -------
 setup.cfg  | 10 +++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 .isort.cfg

diff --git a/.isort.cfg b/.isort.cfg
deleted file mode 100644
index 4ef919bf..00000000
--- a/.isort.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[settings]
-known_first_party=wagtailmedia
-known_django=django
-skip=migrations
-sections=FUTURE, STDLIB, DJANGO, THIRDPARTY, FIRSTPARTY, LOCALFOLDER
-default_section=THIRDPARTY
-multi_line_output=5
diff --git a/setup.cfg b/setup.cfg
index c567bd21..2bbe4952 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,4 +3,12 @@ universal = 1
 
 [flake8]
 max-line-length=120
-exclude=migrations
\ No newline at end of file
+exclude=migrations
+
+[isort]
+known_first_party=wagtailmedia
+known_django=django
+skip=migrations
+sections=FUTURE, STDLIB, DJANGO, THIRDPARTY, FIRSTPARTY, LOCALFOLDER
+default_section=THIRDPARTY
+multi_line_output=5

From 74b06844426bd1c569fe5e173d5655c213aeb147 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 16:25:51 +0100
Subject: [PATCH 09/10] Update imports using isort 4.2.5

---
 wagtailmedia/tests/test_permissions.py | 2 +-
 wagtailmedia/tests/test_views.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtailmedia/tests/test_permissions.py b/wagtailmedia/tests/test_permissions.py
index a134619f..2b59796c 100644
--- a/wagtailmedia/tests/test_permissions.py
+++ b/wagtailmedia/tests/test_permissions.py
@@ -6,10 +6,10 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
+from six import b
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore.models import Collection, GroupCollectionPermission
 
-from six import b
 from wagtailmedia import models
 
 
diff --git a/wagtailmedia/tests/test_views.py b/wagtailmedia/tests/test_views.py
index ef8998e4..c2ee21a7 100644
--- a/wagtailmedia/tests/test_views.py
+++ b/wagtailmedia/tests/test_views.py
@@ -7,12 +7,12 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 
+from six import b
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore.models import (
     Collection, GroupCollectionPermission, Page
 )
 
-from six import b
 from wagtailmedia import models
 from wagtailmedia.tests.testapp.models import EventPage, EventPageRelatedMedia
 

From f580295ea513b1f608c6eb6ff49d8279aec9dc68 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Fri, 28 Oct 2016 17:27:52 +0100
Subject: [PATCH 10/10] Version 0.1.2

---
 wagtailmedia/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtailmedia/__init__.py b/wagtailmedia/__init__.py
index 19baa412..99ecfdb3 100644
--- a/wagtailmedia/__init__.py
+++ b/wagtailmedia/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '0.1.1'
+__version__ = '0.1.2'
 
 default_app_config = 'wagtailmedia.apps.WagtailMediaAppConfig'