Commit 98eb4a71 authored by Seb's avatar Seb
Browse files

flake8 + isort

parent 272d9282
...@@ -38,14 +38,14 @@ flake8: ...@@ -38,14 +38,14 @@ flake8:
isort: isort:
stage: lint stage: lint
image: python:3.8 image: python:3.10
before_script: before_script:
- pip install isort -e . - pip install isort -e .
script: script:
- isort --recursive --diff --check-only wagtailvideos/ tests/ - isort --recursive --diff --check-only wagtailvideos/ tests/
build: build:
image: python:3.8 image: python:3.10
stage: release stage: release
before_script: before_script:
- pip install --upgrade setuptools wheel twine - pip install --upgrade setuptools wheel twine
......
...@@ -8,8 +8,7 @@ from wagtailvideos import ffmpeg ...@@ -8,8 +8,7 @@ from wagtailvideos import ffmpeg
def ffmpeg_check(app_configs, **kwargs): def ffmpeg_check(app_configs, **kwargs):
messages = [] messages = []
if ( if (
not ffmpeg.installed() not ffmpeg.installed() and not getattr(settings, 'WAGTAIL_VIDEOS_DISABLE_TRANSCODE', False)
and not getattr(settings, 'WAGTAIL_VIDEOS_DISABLE_TRANSCODE', False)
): ):
messages.append( messages.append(
Warning( Warning(
......
from django.conf import settings from django.conf import settings
from django.utils.translation import gettext_lazy as _
from django.urls import reverse from django.urls import reverse
from django.views.generic.base import View
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _
from django.views.generic.base import View
from wagtail.admin.auth import PermissionPolicyChecker from wagtail.admin.auth import PermissionPolicyChecker
from wagtail.admin.models import popular_tags_for_model from wagtail.admin.models import popular_tags_for_model
from wagtail.admin.views.generic.chooser import ( from wagtail.admin.views.generic.chooser import (
BaseChooseView, BaseChooseView, ChooseResultsViewMixin, ChooseViewMixin,
ChooseResultsViewMixin, ChosenResponseMixin, ChosenViewMixin, CreateViewMixin, CreationFormMixin)
ChooseViewMixin,
ChosenResponseMixin,
ChosenViewMixin,
CreateViewMixin,
CreationFormMixin,
)
from wagtail.admin.viewsets.chooser import ChooserViewSet from wagtail.admin.viewsets.chooser import ChooserViewSet
from wagtailvideos import get_video_model from wagtailvideos import get_video_model
from wagtailvideos.forms import get_video_form from wagtailvideos.forms import get_video_form
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
......
...@@ -3,7 +3,6 @@ import json ...@@ -3,7 +3,6 @@ import json
from django import forms from django import forms
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from wagtail.admin.staticfiles import versioned_static from wagtail.admin.staticfiles import versioned_static
from wagtail.admin.widgets import BaseChooser, BaseChooserAdapter from wagtail.admin.widgets import BaseChooser, BaseChooserAdapter
from wagtail.telepath import register from wagtail.telepath import register
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment