birger/952 filterset factory

apis_core/generic/filterbackends.py

@@ -1,5 +1,6 @@
 from django_filters.rest_framework import DjangoFilterBackend
-from .filtersets import filterset_factory, GenericFilterSet
+from django_filters.filterset import filterset_factory
+from .filtersets import GenericFilterSet
 from .helpers import module_paths, first_member_match
 
 

apis_core/generic/filtersets.py

@@ -1,5 +1,4 @@
 from django_filters.filterset import FilterSet
-from django_filters.constants import ALL_FIELDS
 from .forms import GenericFilterSetForm
 
 
@@ -26,14 +25,3 @@ def form(self):
             else:
                 self._form = Form(prefix=self.form_prefix, model=self._meta.model)
         return self._form
-
-
-# This is a backport from https://github.com/carltongibson/django-filter/pull/1636
-# It can be removed once that is merged and released
-def filterset_factory(model, filterset=FilterSet, fields=ALL_FIELDS):
-    attrs = {"model": model, "fields": fields}
-    bases = (filterset.Meta,) if hasattr(filterset, "Meta") else ()
-    Meta = type("Meta", bases, attrs)
-    return type(filterset)(
-        str("%sFilterSet" % model._meta.object_name), (filterset,), {"Meta": Meta}
-    )

apis_core/generic/views.py

@@ -9,13 +9,14 @@
 from django.template.exceptions import TemplateDoesNotExist
 
 from django_filters.views import FilterView
+from django_filters.filterset import filterset_factory
 from django_tables2 import SingleTableMixin
 from django_tables2.tables import table_factory
 from django_tables2.columns import library
 from dal import autocomplete
 
 from .tables import GenericTable
-from .filtersets import filterset_factory, GenericFilterSet
+from .filtersets import GenericFilterSet
 from .forms import GenericModelForm, GenericImportForm
 from .helpers import (
     template_names_via_mro,

pyproject.toml

@@ -12,7 +12,7 @@ exclude = ["manage.py", "__pycache__"]
 python = "^3.11"
 Django = ">=4.1,<6.0"
 djangorestframework = "^3.14.0"
-django-filter = ">=23.5,<25.0"
+django-filter = ">=24.1"
 django-autocomplete-light = ">=3.9.4,<3.12.0"
 django-crum = "^0.7.9"
 django-crispy-forms = "^2"