Merge pull request #137 from josephapg/fix-deprecations

barseghyanartur · web-flow · commit 54f6cb1372cc · 2019-06-26T22:05:39.000+02:00
Fix Django REST Framework deprecations
diff --git a/.travis.yml b/.travis.yml
@@ -8,12 +8,6 @@ language: python
 matrix:
   fast_finish: true
   include:
-  - env: TOX_ENV=py27-django18
-    python: 2.7
-  - env: TOX_ENV=py27-django19
-    python: 2.7
-  - env: TOX_ENV=py27-django110
-    python: 2.7
   - env: TOX_ENV=py27-django111
     python: 2.7
   - env: TOX_ENV=py35-django20
diff --git a/docs/quick_start.rst b/docs/quick_start.rst
@@ -994,7 +994,7 @@ Router definition
     router = DefaultRouter()
     books = router.register(r'books',
                             BookDocumentView,
-                            base_name='bookdocument')
+                            basename='bookdocument')
 
 URL patterns
 ~~~~~~~~~~~~
diff --git a/docs_src/quick_start.rst b/docs_src/quick_start.rst
@@ -994,7 +994,7 @@ Router definition
     router = DefaultRouter()
     books = router.register(r'books',
                             BookDocumentView,
-                            base_name='bookdocument')
+                            basename='bookdocument')
 
 URL patterns
 ~~~~~~~~~~~~
diff --git a/examples/requirements/django_1_10.txt b/examples/requirements/django_1_10.txt
diff --git a/examples/requirements/django_1_11.txt b/examples/requirements/django_1_11.txt
@@ -7,5 +7,5 @@ django-debug-toolbar==1.5
 django-debug-toolbar-force==0.1.3
 django-elasticsearch-debug-toolbar==1.2.0
 django-ormex==0.2
-djangorestframework==3.7.7
+djangorestframework==3.9.3
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_8.txt b/examples/requirements/django_1_8.txt
diff --git a/examples/requirements/django_1_9.txt b/examples/requirements/django_1_9.txt
diff --git a/examples/requirements/django_2_0.txt b/examples/requirements/django_2_0.txt
@@ -7,5 +7,5 @@ django-debug-toolbar>=1.6
 django-debug-toolbar-force>=0.1.3
 django-elasticsearch-debug-toolbar>=1.2.0
 django-ormex>=0.2
-djangorestframework==3.7.7
+djangorestframework==3.9.3
 sqlparse>=0.2.2
diff --git a/examples/requirements/django_2_1.txt b/examples/requirements/django_2_1.txt
@@ -7,5 +7,5 @@ django-debug-toolbar>=1.9.1
 django-debug-toolbar-force>=0.1.3
 django-elasticsearch-debug-toolbar>=1.2.0
 django-ormex>=0.2
-djangorestframework==3.8.2
+djangorestframework==3.9.3
 sqlparse>=0.2.2
diff --git a/examples/requirements/django_2_2.txt b/examples/requirements/django_2_2.txt
@@ -7,5 +7,5 @@ django-debug-toolbar==1.9.1
 django-debug-toolbar-force>=0.1.3
 django-elasticsearch-debug-toolbar>=1.2.0
 django-ormex>=0.2
-djangorestframework==3.9.2
+djangorestframework==3.9.3
 sqlparse>=0.2.2
diff --git a/examples/simple/search_indexes/urls.py b/examples/simple/search_indexes/urls.py
@@ -38,13 +38,13 @@
 router.register(
     r'addresses',
     AddressDocumentViewSet,
-    base_name='addressdocument'
+    basename='addressdocument'
 )
 
 router.register(
     r'addresses-frontend',
     FrontAddressDocumentViewSet,
-    base_name='addressdocument_frontend'
+    basename='addressdocument_frontend'
 )
 
 # **********************************************************
@@ -53,7 +53,7 @@
 router.register(
     r'authors',
     AuthorDocumentViewSet,
-    base_name='authordocument'
+    basename='authordocument'
 )
 
 # **********************************************************
@@ -62,109 +62,109 @@
 router.register(
     r'books',
     BookDocumentViewSet,
-    base_name='bookdocument'
+    basename='bookdocument'
 )
 
 router.register(
     r'books-ordered-by-score',
     BookOrderingByScoreDocumentViewSet,
-    base_name='bookdocument_ordered_by_score'
+    basename='bookdocument_ordered_by_score'
 )
 
 router.register(
     r'books-functional-suggester',
     BookFunctionalSuggesterDocumentViewSet,
-    base_name='bookdocument_functional_suggester'
+    basename='bookdocument_functional_suggester'
 )
 
 router.register(
     r'books-frontend',
     BookFrontendDocumentViewSet,
-    base_name='bookdocument_frontend'
+    basename='bookdocument_frontend'
 )
 
 router.register(
     r'books-permissions',
     BookPermissionsDocumentViewSet,
-    base_name='bookdocument_permissions'
+    basename='bookdocument_permissions'
 )
 
 router.register(
     r'books-custom',
     BookCustomDocumentViewSet,
-    base_name='bookdocument_custom'
+    basename='bookdocument_custom'
 )
 
 router.register(
     r'books-ignore-index-errors',
     BookIgnoreIndexErrorsDocumentViewSet,
-    base_name='bookdocument_ignore_index_errors'
+    basename='bookdocument_ignore_index_errors'
 )
 
 router.register(
     r'books-more-like-this',
     BookMoreLikeThisDocumentViewSet,
-    base_name='bookdocument_more_like_this'
+    basename='bookdocument_more_like_this'
 )
 
 router.register(
     r'books-more-like-this-no-options',
     BookMoreLikeThisNoOptionsDocumentViewSet,
-    base_name='bookdocument_more_like_this_no_options'
+    basename='bookdocument_more_like_this_no_options'
 )
 
 router.register(
     r'books-default-filter-lookup',
     BookDefaultFilterLookupDocumentViewSet,
-    base_name='bookdocument_default_filter_lookup'
+    basename='bookdocument_default_filter_lookup'
 )
 
 router.register(
     r'books-compound-search-backend',
     BookCompoundSearchBackendDocumentViewSet,
-    base_name='bookdocument_compound_search_backend'
+    basename='bookdocument_compound_search_backend'
 )
 
 router.register(
     r'books-compound-search-boost-backend',
     BookCompoundSearchBoostSearchBackendDocumentViewSet,
-    base_name='bookdocument_compound_search_boost_backend'
+    basename='bookdocument_compound_search_boost_backend'
 )
 
 router.register(
     r'books-compound-search-backend-ordered-by-score',
     BookOrderingByScoreCompoundSearchBackendDocumentViewSet,
-    base_name='bookdocument_compound_search_backend_ordered_by_score'
+    basename='bookdocument_compound_search_backend_ordered_by_score'
 )
 
 router.register(
     r'books-source',
     BookSourceSearchBackendDocumentViewSet,
-    base_name='bookdocument_source'
+    basename='bookdocument_source'
 )
 
 router.register(
     r'books-multi-match-search-backend',
     BookMultiMatchSearchFilterBackendDocumentViewSet,
-    base_name='bookdocument_multi_match_search_backend'
+    basename='bookdocument_multi_match_search_backend'
 )
 
 router.register(
     r'books-multi-match-phrase-prefix-search-backend',
     BookMultiMatchOptionsPhasePrefixSearchFilterBackendDocumentViewSet,
-    base_name='bookdocument_multi_match_phrase_prefix_search_backend'
+    basename='bookdocument_multi_match_phrase_prefix_search_backend'
 )
 
 router.register(
     r'books-simple-query-string-search-backend',
     BookSimpleQueryStringSearchFilterBackendDocumentViewSet,
-    base_name='bookdocument_simple_query_string_search_backend'
+    basename='bookdocument_simple_query_string_search_backend'
 )
 
 router.register(
     r'books-simple-query-string-boost-search-backend',
     BookSimpleQueryStringBoostSearchFilterBackendDocumentViewSet,
-    base_name='bookdocument_simple_query_string_boost_search_backend'
+    basename='bookdocument_simple_query_string_boost_search_backend'
 )
 
 # **********************************************************
@@ -174,13 +174,13 @@
 router.register(
     r'cities',
     CityDocumentViewSet,
-    base_name='citydocument'
+    basename='citydocument'
 )
 
 router.register(
     r'cities-compound-search-backend',
     CityCompoundSearchBackendDocumentViewSet,
-    base_name='citydocument_compound_search_backend'
+    basename='citydocument_compound_search_backend'
 )
 
 # **********************************************************
@@ -190,7 +190,7 @@
 router.register(
     r'locations',
     LocationDocumentViewSet,
-    base_name='locationdocument'
+    basename='locationdocument'
 )
 
 # **********************************************************
@@ -200,7 +200,7 @@
 router.register(
     r'publishers',
     PublisherDocumentViewSet,
-    base_name='publisherdocument'
+    basename='publisherdocument'
 )
 
 # **********************************************************
diff --git a/examples/simple/search_indexes/viewsets/book/frontend.py b/examples/simple/search_indexes/viewsets/book/frontend.py
@@ -34,7 +34,7 @@
 
 from elasticsearch_dsl import DateHistogramFacet, RangeFacet
 
-from rest_framework.decorators import detail_route, list_route
+from rest_framework.decorators import action
 
 from ...documents import BookDocument
 from ...serializers import BookDocumentSimpleSerializer
@@ -356,7 +356,7 @@ def list(self, request, *args, **kwargs):
             **kwargs
         )
 
-    @list_route()
+    @action(detail=False)
     def suggest(self, request):
         # Used for suggest routes, like
         # http://localhost:8000/search/books-custom/suggest/?title_suggest=A
@@ -366,7 +366,7 @@ def suggest(self, request):
             request
         )
 
-    @list_route()
+    @action(detail=False)
     def functional_suggest(self, request):
         # Used for functional suggest routes, like
         # http://localhost:8000/search/books-custom/functional_suggest/
diff --git a/examples/simple/search_indexes/viewsets/book/permissions.py b/examples/simple/search_indexes/viewsets/book/permissions.py
@@ -34,7 +34,7 @@
 
 from elasticsearch_dsl import DateHistogramFacet, RangeFacet
 
-from rest_framework.decorators import detail_route, list_route
+from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.permissions import BasePermission
 from ...documents import BookDocument
diff --git a/src/django_elasticsearch_dsl_drf/viewsets.py b/src/django_elasticsearch_dsl_drf/viewsets.py
@@ -15,7 +15,7 @@
 from elasticsearch_dsl.query import MoreLikeThis
 
 from rest_framework import status
-from rest_framework.decorators import detail_route, list_route
+from rest_framework.decorators import action
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet
@@ -39,7 +39,7 @@
 class SuggestMixin(object):
     """Suggest mixin."""
 
-    @list_route()
+    @action(detail=False)
     def suggest(self, request):
         """Suggest functionality."""
         queryset = self.filter_queryset(self.get_queryset())
@@ -56,7 +56,7 @@ def suggest(self, request):
 class FunctionalSuggestMixin(object):
     """Functional suggest mixin."""
 
-    @list_route()
+    @action(detail=False)
     def functional_suggest(self, request):
         """Functional suggest functionality.
 
@@ -86,7 +86,7 @@ def functional_suggest(self, request):
 class MoreLikeThisMixin(object):
     """More-like-this mixin."""
 
-    @detail_route()
+    @action(detail=True)
     def more_like_this(self, request, pk=None, id=None):
         """More-like-this functionality detail view.
 
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{27,35,36}-{django18,django19,django110,django111}
+    py{27,35,36}-{django111}
     py{35,36}-{django20}
     py{36,37}-{django111,django20,django21,django22}-{none,coreapischema}
 
@@ -11,9 +11,6 @@ envlogdir=
     examples/tmp/
 passenv = *
 deps =
-    django18: -r{toxinidir}/examples/requirements/django_1_8.txt
-    django19: -r{toxinidir}/examples/requirements/django_1_9.txt
-    django110: -r{toxinidir}/examples/requirements/django_1_10.txt
     django111: -r{toxinidir}/examples/requirements/django_1_11.txt
     django20: -r{toxinidir}/examples/requirements/django_2_0.txt
     django21: -r{toxinidir}/examples/requirements/django_2_1.txt
