Skip to content

Commit

Permalink
Drop 5.2 support between LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
seb-b committed Aug 12, 2024
1 parent 6927efc commit 2e69d4d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ head:
before_script:
- pip install .


lts_52:
image: python:3.11
extends: .python_test
before_script:
- pip install . wagtail~=5.2 django~=4.2
# Bring back with next LTS (6.3)
# lts_52:
# image: python:3.11
# extends: .python_test
# before_script:
# - pip install . wagtail~=5.2 django~=4.2

flake8:
stage: lint
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ html5 compliant codec using ffmpeg.
Requirements
------------

- Wagtail >= 5.2 (for older wagtail version see the tags)
- Wagtail >= 6.2 (for older wagtail version see the tags)
- `ffmpeg <https://ffmpeg.org/>`__ (optional, for transcoding)

Installing
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

setup(
name="wagtailvideos",
version="6.1.2",
version="7.0.0",
description="A wagtail module for uploading and displaying videos in various codecs.",
long_description=readme,
author="Neon Jungle",
author_email="[email protected]",
url="https://github.com/neon-jungle/wagtailvideos",
install_requires=[
"wagtail>=5.2",
"wagtail>=6.1",
"Django>=3.2",
"bcp47==0.0.4",
"wagtail-modeladmin>=2.0.0"
Expand Down
1 change: 1 addition & 0 deletions wagtailvideos/views/multiple.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.views.decorators.vary import vary_on_headers
from wagtail.admin.auth import PermissionPolicyChecker
from wagtail.search.backends import get_search_backends

from wagtailvideos import get_video_model
from wagtailvideos.forms import get_video_form
from wagtailvideos.permissions import permission_policy
Expand Down
13 changes: 4 additions & 9 deletions wagtailvideos/views/videos.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,17 @@
from django.urls import reverse
from django.utils.translation import gettext as _
from django.views.decorators.http import require_POST
from django.views.decorators.vary import vary_on_headers
from wagtail.admin import messages
from wagtail.admin.auth import PermissionPolicyChecker
from wagtail.admin.forms.search import SearchForm
from wagtail.admin.models import popular_tags_for_model
from wagtail.models import Collection
from wagtail.admin.filters import BaseMediaFilterSet
from wagtail.admin.views import generic
from wagtail.search.backends import get_search_backends
from wagtail_modeladmin.helpers import AdminURLHelper

from wagtailvideos import (
get_transcoder_backend, get_video_model, is_modeladmin_installed)
from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
from wagtailvideos.permissions import permission_policy
from wagtail.admin.views import generic
from wagtail.admin.filters import BaseMediaFilterSet
from wagtailvideos.permissions import permission_policy

permission_checker = PermissionPolicyChecker(permission_policy)

Expand All @@ -37,7 +32,6 @@ class Meta:

class IndexView(generic.IndexView):
context_object_name = "videos"
# permission_policy = TODO
model = Video
filterset_class = VideoFilterSet
permission_policy = permission_policy
Expand All @@ -62,7 +56,8 @@ def get_filterset_kwargs(self):
return kwargs

def get_paginate_by(self, queryset):
return 32 # 4 x 8
return 32 # 4 x 8


@permission_checker.require('change')
def edit(request, video_id):
Expand Down

0 comments on commit 2e69d4d

Please sign in to comment.