Merge remote-tracking branch 'origin/master'

# Conflicts:
#	wagtailvideos/views/chooser.py
#	wagtailvideos/views/videos.py

settings.py

-from tests.app.settings import *    # noqa: F401,F403
+from tests.app.settings import *  # noqa: F401,F403
 
 DATABASES = {
     'default': {

setup.py

@@ -6,7 +6,7 @@ Install wagtailvideos using setuptools
 with open('README.rst', 'r') as f:
     readme = f.read()
 
-from setuptools import find_packages, setup     # noqa: E4
+from setuptools import find_packages, setup  # noqa: E4
 
 setup(
     name='wagtailvideos',

wagtailvideos/forms.py

 from django import forms
 from django.forms.models import modelform_factory
 from django.utils.translation import ugettext as _
+
 from enumchoicefield.forms import EnumField
 from wagtail.admin import widgets
 from wagtail.admin.forms.collections import (
     BaseCollectionMemberForm, collection_member_permission_formset_factory)
-
 from wagtailvideos.fields import WagtailVideoField
 from wagtailvideos.models import MediaFormats, Video, VideoQuality
 from wagtailvideos.permissions import \

wagtailvideos/models.py

@@ -20,13 +20,13 @@ from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.html import mark_safe
 from django.utils.translation import ugettext_lazy as _
+
 from enumchoicefield import ChoiceEnum, EnumChoiceField
 from taggit.managers import TaggableManager
 from wagtail.admin.utils import get_object_usage
 from wagtail.core.models import CollectionMember
 from wagtail.search import index
 from wagtail.search.queryset import SearchableQuerySetMixin
-
 from wagtailvideos import ffmpeg
 
 logger = logging.getLogger(__name__)

wagtailvideos/permissions.py

 from wagtail.core.permission_policies.collections import (
     CollectionOwnershipPermissionPolicy)
-
 from wagtailvideos.models import Video
 
 permission_policy = CollectionOwnershipPermissionPolicy(

wagtailvideos/views/multiple.py

@@ -4,9 +4,9 @@ from django.template.loader import render_to_string
 from django.utils.encoding import force_text
 from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
+
 from wagtail.admin.utils import PermissionPolicyChecker
 from wagtail.search.backends import get_search_backends
-
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy

wagtailvideos/wagtail_hooks.py

@@ -2,9 +2,9 @@ from django.conf.urls import include, url
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
+
 from wagtail.admin.menu import MenuItem
 from wagtail.core import hooks
-
 from wagtailvideos import urls
 from wagtailvideos.forms import GroupVideoPermissionFormSet
 

wagtailvideos/widgets.py

@@ -2,8 +2,8 @@ import json
 
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
-from wagtail.admin.widgets import AdminChooser
 
+from wagtail.admin.widgets import AdminChooser
 from wagtailvideos.models import Video