Enforce style using tox, travis tests

.travis.yml

@@ -18,6 +18,7 @@ env:
     - DJANGO='19' WAGTAIL='15'
     - DJANGO='19' WAGTAIL='16'
     - DJANGO='110' WAGTAIL='16'
+    - TOX_ENV=flake8,isort
 
 before_install:
     # - sudo add-apt-repository ppa:mc3man/trusty-media -y // Inlcudes all multimedia options but 404s currently :(

setup.cfg

 [metadata]
 description-file = README.rst
+
 [bdist_wheel]
 universal = 1
+
+[isort]
+skip_glob = */migrations/*
+line_length = 79
+multi_line_output = 4
+
+[pep8]
+max-line-length = 100
+
+[flake8]
+max-line-length = 100
+ignore = E501
+exclude = migrations

tests/test_template_tag.py

@@ -16,7 +16,7 @@ class TestVideoTag(TestCase):
 
     def render_video_tag(self, video, attrs=''):
         temp = Template('{% load wagtailvideos_tags %}{% video video_obj ' + attrs + ' %}')
-        context = Context({'video_obj':video})
+        context = Context({'video_obj': video})
         return temp.render(context)
 
     def test_video_tag(self):

tox.ini

@@ -8,14 +8,18 @@ envlist =
 	py{27,34,35}-dj{18,19}-wt15
 	# Current version
 	py{27,34,35}-dj{19,110}-wt16
+	# Enforce good style
+	flake8,isort
 
+[base]
+deps = mock
 
 [testenv]
 commands = python runtests.py {posargs}
 pip_pre = True
 
 deps =
-	mock
+	{[base]deps}
 	dj18: Django~=1.8.0
 	dj19: Django~=1.9.0
 	dj110: Django~=1.10.0
@@ -23,3 +27,16 @@ deps =
 	wt14: wagtail~=1.4.0
 	wt15: wagtail~=1.5.0
 	wt16: wagtail~=1.6.0
+
+[testenv:flake8]
+deps = flake8
+basepython = python3.5
+commands = flake8 wagtailvideos/ tests/
+
+[testenv:isort]
+usedevelop = True
+deps =
+	{[base]deps}
+	isort==4.2.2
+basepython = python3.5
+commands = isort --recursive --diff --check-only wagtailvideos/ tests/

wagtailvideos/forms.py

@@ -5,8 +5,9 @@ from django.forms.models import modelform_factory
 from django.utils.translation import ugettext as _
 from enumchoicefield.forms import EnumField
 from wagtail.wagtailadmin import widgets
-from wagtail.wagtailadmin.forms import (BaseCollectionMemberForm,
-                                        collection_member_permission_formset_factory)
+from wagtail.wagtailadmin.forms import (
+    BaseCollectionMemberForm, collection_member_permission_formset_factory)
+
 from wagtailvideos.fields import WagtailVideoField
 from wagtailvideos.models import MediaFormats, Video, VideoQuality
 from wagtailvideos.permissions import \
@@ -56,7 +57,7 @@ class VideoTranscodeAdminForm(forms.Form):
     media_format = EnumField(MediaFormats)
     quality = EnumField(VideoQuality)
 
-    def __init__(self, video, data=None,  **kwargs):
+    def __init__(self, video, data=None, **kwargs):
         super(VideoTranscodeAdminForm, self).__init__(data=data, **kwargs)
         self.video = video
 

wagtailvideos/models.py

@@ -29,6 +29,7 @@ from wagtail.wagtailadmin.utils import get_object_usage
 from wagtail.wagtailcore.models import CollectionMember
 from wagtail.wagtailsearch import index
 from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin
+
 from wagtailvideos.utils import ffmpeg_installed
 
 logger = logging.getLogger(__name__)

wagtailvideos/views/multiple.py

@@ -8,6 +8,7 @@ from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
 from wagtail.wagtailadmin.utils import PermissionPolicyChecker
 from wagtail.wagtailsearch.backends import get_search_backends
+
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy

wagtailvideos/views/videos.py

@@ -13,6 +13,7 @@ from wagtail.wagtailadmin.forms import SearchForm
 from wagtail.wagtailadmin.utils import PermissionPolicyChecker
 from wagtail.wagtailcore.models import Collection
 from wagtail.wagtailsearch.backends import get_search_backends
+
 from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy

wagtailvideos/wagtail_hooks.py

@@ -7,6 +7,7 @@ from django.utils.html import format_html, format_html_join
 from django.utils.translation import ugettext_lazy as _
 from wagtail.wagtailadmin.menu import MenuItem
 from wagtail.wagtailcore import hooks
+
 from wagtailvideos.forms import GroupVideoPermissionFormSet
 
 from . import urls