Merge pull request #44 from neon-jungle/revert-42-master

Revert "Version number comparisons for conditional imports (wagtail 2.10 > 2.7)"

wagtailvideos/models.py

@@ -6,7 +6,6 @@ import shutil
 import subprocess
 import tempfile
 import threading
-from packaging import version
 from contextlib import contextmanager
 
 import wagtail
@@ -30,7 +29,7 @@ from wagtail.search.queryset import SearchableQuerySetMixin
 
 from wagtailvideos import ffmpeg
 
-if version.parse(wagtail.__version__) >= version.parse('2.7'):
+if wagtail.__version__ >= '2.7':
     from wagtail.admin.models import get_object_usage
 else:
     from wagtail.admin.utils import get_object_usage

wagtailvideos/views/chooser.py

 import wagtail
-from packaging import version
 from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
@@ -13,7 +12,7 @@ from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy
 
-if version.parse(wagtail.__version__) >= version.parse('2.7'):
+if wagtail.__version__ >= '2.7':
     from wagtail.admin.models import popular_tags_for_model
     from wagtail.admin.auth import PermissionPolicyChecker
 else:

wagtailvideos/views/multiple.py

 import wagtail
-from packaging import version
 from django.http import HttpResponseBadRequest, JsonResponse
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
@@ -12,7 +11,7 @@ from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy
 
-if version.parse(wagtail.__version__) >= version.parse('2.7'):
+if wagtail.__version__ >= '2.7':
     from wagtail.admin.auth import PermissionPolicyChecker
 else:
     from wagtail.admin.utils import PermissionPolicyChecker

wagtailvideos/views/videos.py

 import wagtail
-from packaging import version
 from django.core.paginator import Paginator
 from django.http import HttpResponseNotAllowed
 from django.shortcuts import get_object_or_404, redirect, render
@@ -16,7 +15,7 @@ from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy
 
-if version.parse(wagtail.__version__) >= version.parse('2.7'):
+if wagtail.__version__ >= '2.7':
     from wagtail.admin.models import popular_tags_for_model
     from wagtail.admin.auth import PermissionPolicyChecker
 else: