Upgrade django-filter

Author: humitos

readthedocs/restapi/views/model_views.py

@@ -105,7 +105,6 @@ class ProjectViewSet(UserSelectViewSet):
     admin_serializer_class = ProjectAdminSerializer
     model = Project
     pagination_class = api_utils.ProjectPagination
-    filter_fields = ('slug',)  # django-filter<2.0.0
     filterset_fields = ('slug',)
 
     @decorators.action(detail=True)
@@ -250,10 +249,6 @@ class VersionViewSet(UserSelectViewSet):
     serializer_class = VersionSerializer
     admin_serializer_class = VersionAdminSerializer
     model = Version
-    filter_fields = (
-        'active',
-        'project__slug',
-    )  # django-filter<2.0.0
     filterset_fields = (
         'active',
         'project__slug',
@@ -266,7 +261,6 @@ class BuildViewSetBase(UserSelectViewSet):
     serializer_class = BuildSerializer
     admin_serializer_class = BuildAdminSerializer
     model = Build
-    filter_fields = ('project__slug', 'commit')  # django-filter<2.0.0
     filterset_fields = ('project__slug', 'commit')
 
 

requirements/pip.txt

@@ -11,13 +11,7 @@ django-extensions==2.1.4
 djangorestframework==3.9.1
 
 # Filtering for the REST API
-# When Python2 gets deprecated we can upgrade django-filter
-# >   from .filterset import FilterSet
-# E     File "/home/travis/build/rtfd/readthedocs.org/.tox/py27/lib/python2.7/site-packages/django_filters/filterset.py", line 184
-# E       def __init__(self, data=None, queryset=None, *, request=None, prefix=None):
-# E                                                     ^
-# E   SyntaxError: invalid syntax
-django-filter<2.0.0
+django-filter==2.1.0
 
 django-vanilla-views==1.0.6
 jsonfield==2.0.2