Skip to content

HACK FIX - Removed dependency on 'packaging.versions' #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2020
Merged

HACK FIX - Removed dependency on 'packaging.versions' #272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions figures/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
update the test class names in "tests/test_filters.py" to match.
"""

from packaging import version
from django.contrib.auth import get_user_model
from django.contrib.sites.models import Site
from django.db.models import F
Expand All @@ -27,7 +26,6 @@

from student.models import CourseEnrollment # pylint: disable=import-error


from figures.pipeline.course_daily_metrics import get_enrolled_in_exclude_admins
from figures.models import (
CourseDailyMetrics,
Expand All @@ -38,6 +36,23 @@
)


def hack_get_version(version_string):
"""Get the parsed version string as a list of ints [major, minor, point]

This works with packages that use only numbers in the format of
"major.minor.point"

This is hopefully a temporary hack. We cannot expect the Open edX deployment
to have `packaging` installed, so the original implementation here which
used `packaging.versions` to check the version is not supported without
requiring the extra step of installing `packaging`
"""
return [int(val) for val in version_string.split('.')]


DJANGO_FILTERS_VERSION = hack_get_version(django_filters.__version__)


def char_filter(field_name, lookup_expr):
"""For backwards compatibility.

Expand All @@ -50,10 +65,9 @@ def char_filter(field_name, lookup_expr):

And we'll need to replace the code in PR 264 with this function
"""
django_filters_version = version.parse(django_filters.__version__)
if django_filters_version < version.parse('1.0.0'):
if DJANGO_FILTERS_VERSION[0] < 1:
return django_filters.CharFilter(name=field_name, lookup_type=lookup_expr)
elif django_filters_version < version.parse('2.0.0'):
elif DJANGO_FILTERS_VERSION[0] < 2:
return django_filters.CharFilter(name=field_name, lookup_expr=lookup_expr)
else:
return django_filters.CharFilter(field_name=field_name, lookup_expr=lookup_expr)
Expand Down Expand Up @@ -98,8 +112,7 @@ class `CharFilter` with custom method handling.
Version 1.x replaces `MethodFilter` class with `FilterMethod`
Version 2.x changes the `name` parameter to `field_name`
"""
django_filters_version = version.parse(django_filters.__version__)
if django_filters_version < version.parse('1.0.0'):
if DJANGO_FILTERS_VERSION[0] < 1:
class CompatMethodFilter(django_filters.MethodFilter): # pylint: disable=no-member
def filter(self, qs, value):
'''
Expand Down