Bump djangorestframework to 3.11.0 and django-filter to 2.2.0

Author: sks444

junction/conferences/views.py

@@ -5,7 +5,10 @@
 from django.http.response import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.views.decorators.http import require_http_methods
-from rest_framework import filters, viewsets
+
+from django_filters import rest_framework as filters
+
+from rest_framework import viewsets
 
 from .models import Conference, ConferenceVenue, Room
 from .serializers import ConferenceSerializer, RoomSerializer, VenueSerializer
@@ -25,7 +28,7 @@ class RoomView(viewsets.ReadOnlyModelViewSet):
     queryset = Room.objects.all()
     serializer_class = RoomSerializer
     filter_backend = (filters.DjangoFilterBackend,)
-    filter_fields = ("venue",)
+    filterset_fields = ("venue",)
 
 
 @require_http_methods(["GET"])

junction/proposals/views.py

@@ -12,9 +12,11 @@
 from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import require_http_methods
 from hashids import Hashids
-from rest_framework import filters, viewsets
+from rest_framework import viewsets
 from rest_framework.response import Response
 
+from django_filters import rest_framework as filters
+
 from junction.base.constants import (
     ConferenceSettingConstants,
     ConferenceStatus,
@@ -39,7 +41,7 @@ class ProposalView(viewsets.ReadOnlyModelViewSet):
     queryset = Proposal.objects.filter(status=2)
     serializer_class = serializers.ProposalSerializer
     filter_backend = (filters.DjangoFilterBackend,)
-    filter_fields = ("conference", "review_status", "proposal_type", "proposal_section")
+    filterset_fields = ("conference", "review_status", "proposal_type", "proposal_section")
 
     def get_queryset(self):
         data = super(ProposalView, self).get_queryset()

junction/schedule/views.py

@@ -6,9 +6,11 @@
 from django.http import HttpResponse
 from django.shortcuts import Http404, render
 from django.template.loader import render_to_string
-from rest_framework import filters, viewsets
+from rest_framework import viewsets
 from rest_framework.response import Response
 
+from django_filters import rest_framework as filters
+
 from .models import ScheduleItem
 from .serializers import ScheduleSerializer
 
@@ -17,7 +19,7 @@ class ScheduleView(viewsets.ReadOnlyModelViewSet):
     queryset = ScheduleItem.objects.all()
     serializer_class = ScheduleSerializer
     filter_backend = (filters.DjangoFilterBackend,)
-    filter_fields = ("room", "conference", "event_date")
+    filterset_fields = ("room", "conference", "event_date")
 
     def get_queryset(self):
         data = (

requirements.txt

@@ -1,7 +1,7 @@
 Django==1.11.17
 celery==3.1.20
-djangorestframework==3.4
-django-filter==1.0.1
+djangorestframework==3.11.0
+django-filter==2.2.0
 
 # Persistent Store
 # -------------------------------------------------

settings/common.py

@@ -214,10 +214,6 @@
 # Make sure DB request held on for minimim 5 minutes
 CONN_MAX_AGE = 300
 
-REST_FRAMEWORK = {
-    "DEFAULT_FILTER_BACKENDS": ("rest_framework.filters.DjangoFilterBackend",)
-}
-
 EXPLARA_API_TOKEN = "shjbalkfbdskjlbdskljbdskaljfb"
 
 QR_CODES_DIR = ROOT_DIR + "/qr_files"