Fix tests

Bump version number

iSorted

Allow unauthenticated for travis ci

Bump isort

iSort tests

.travis.yml

@@ -29,7 +29,8 @@ matrix:
 before_install:
     - sudo add-apt-repository ppa:mc3man/trusty-media -y
     - sudo apt-get update -qq
-    - sudo apt-get install ffmpeg -y
+    # The install of ffmpeg fails at random with 'There were unauthenticated packages' 🤷‍♂️
+    - sudo apt-get install ffmpeg --allow-unauthenticated -y
 
 install:
   - pip install --upgrade pip wheel tox

setup.py

@@ -10,7 +10,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='wagtailvideos',
-    version='0.4.0',
+    version='2.0.0',
     description="A wagtail module for uploading and displaying videos in various codecs.",
     long_description=readme,
     author='Takeflight',

tests/test_admin_views.py

@@ -5,12 +5,12 @@ import json
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.urls import reverse
 from django.template.defaultfilters import filesizeformat
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from mock import patch
-from wagtail.tests.utils import WagtailTestUtils
 from wagtail.core.models import Collection, GroupCollectionPermission
+from wagtail.tests.utils import WagtailTestUtils
 
 from tests.utils import create_test_video_file
 from wagtailvideos.models import Video

tox.ini

@@ -29,6 +29,6 @@ commands = flake8 wagtailvideos/ tests/
 usedevelop = True
 deps =
 	{[base]deps}
-	isort==4.2.2
+	isort==4.3.4
 basepython = python3.5
 commands = isort --recursive --diff --check-only wagtailvideos/ tests/

wagtailvideos/models.py

@@ -12,11 +12,11 @@ from django.conf import settings
 from django.core.exceptions import SuspiciousFileOperation
 from django.core.files.base import ContentFile
 from django.core.files.temp import NamedTemporaryFile
-from django.urls import reverse
 from django.db import models
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch.dispatcher import receiver
 from django.forms.utils import flatatt
+from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import mark_safe
 from django.utils.translation import ugettext_lazy as _

wagtailvideos/permissions.py

-from wagtail.core.permission_policies.collections import \
-    CollectionOwnershipPermissionPolicy
+from wagtail.core.permission_policies.collections import (
+    CollectionOwnershipPermissionPolicy)
 
 from wagtailvideos.models import Video
 

wagtailvideos/templates/wagtailvideos/videos/edit.html

-{% extends "wagtailadmin/base.html" %} {% load staticfiles i18n wagtailvideos_tags %} {% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %} {% block extra_css %}
+{% extends "wagtailadmin/base.html" %} {% load staticfiles wagtailadmin_tags i18n wagtailvideos_tags %} {% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %} {% block extra_css %}
 <link rel="stylesheet" href="{% static 'wagtailvideos/css/edit-video.css' %}" type="text/css" /> {% endblock %} {% block extra_js %} {{ block.super }} {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
 <script>
     $(function() {
@@ -9,7 +9,7 @@
         });
     });
 </script>
-{% endblock %} {% block content %} {% trans "Editing" as editing_str %} {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" usage_object=video %}
+{% endblock %} {% block content %} {% trans "Editing" as editing_str %} {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" %}
 
 <div class="row row-flush nice-padding">
 
@@ -70,6 +70,13 @@
             {% if video.duration %}
             <dt>{% trans "Duration" %}</dt>
             <dd>{{ video.formatted_duration }}</dd>
+            {% usage_count_enabled as uc_enabled %}
+            {% if uc_enabled %}
+                <dt>{% trans "Usage" %}</dt>
+                <dd>
+                    <a href="{{ video.usage_url }}">{% blocktrans count usage_count=video.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>
+                </dd>
+            {% endif %}
             {% endif %}
         </dl>
     </div>

wagtailvideos/views/chooser.py

 import json
 
-from django.urls import reverse
 from django.shortcuts import get_object_or_404, render
-from wagtail.utils.pagination import paginate
+from django.urls import reverse
 from wagtail.admin.forms import SearchForm
 from wagtail.admin.modal_workflow import render_modal_workflow
-from wagtail.admin.utils import (
-    PermissionPolicyChecker, popular_tags_for_model)
+from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
 from wagtail.core.models import Collection
 from wagtail.search import index as search_index
+from wagtail.utils.pagination import paginate
 
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video

wagtailvideos/views/videos.py

-from django.urls import reverse
 from django.http import HttpResponseNotAllowed
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
-from wagtail.utils.pagination import paginate
 from wagtail.admin import messages
 from wagtail.admin.forms import SearchForm
-from wagtail.admin.utils import (
-    PermissionPolicyChecker, popular_tags_for_model)
+from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
 from wagtail.core.models import Collection
 from wagtail.search.backends import get_search_backends
+from wagtail.utils.pagination import paginate
 
 from wagtailvideos import ffmpeg
 from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form