Drop support for obsolete dependencies

Following specific supports are removed:
* Python 2.7
* Python 3.4
* Django Filter 1.1
* Django REST Framework >=3.8
* Django 2.0

Author: sliverc

.travis.yml

@@ -4,119 +4,63 @@ cache: pip
 # Favor explicit over implicit and use an explicit build matrix.
 matrix:
   allow_failures:
-    - env: TOXENV=py34-df21-django20-drfmaster
-    - env: TOXENV=py35-df21-django20-drfmaster
-    - env: TOXENV=py36-df21-django20-drfmaster
-    - env: TOXENV=py37-df21-django20-drfmaster
-    - env: TOXENV=py35-df21-django21-drfmaster
-    - env: TOXENV=py36-df21-django21-drfmaster
-    - env: TOXENV=py37-df21-django21-drfmaster
-    - env: TOXENV=py35-df21-django22-drfmaster
-    - env: TOXENV=py36-df21-django22-drfmaster
-    - env: TOXENV=py37-df21-django22-drfmaster
+    - env: TOXENV=py35-django21-drfmaster
+    - env: TOXENV=py36-django21-drfmaster
+    - env: TOXENV=py37-django21-drfmaster
+    - env: TOXENV=py35-django22-drfmaster
+    - env: TOXENV=py36-django22-drfmaster
+    - env: TOXENV=py37-django22-drfmaster
 
   include:
     - python: 3.6
       env: TOXENV=flake8
 
-    - python: 2.7
-      env: TOXENV=py27-df11-django111-drf36
-    - python: 2.7
-      env: TOXENV=py27-df11-django111-drf37
-    - python: 2.7
-      env: TOXENV=py27-df11-django111-drf38
-    - python: 2.7
-      env: TOXENV=py27-df11-django111-drf39
-
-    - python: 3.4
-      env: TOXENV=py34-df21-django111-drf36
-    - python: 3.4
-      env: TOXENV=py34-df21-django111-drf37
-    - python: 3.4
-      env: TOXENV=py34-df21-django111-drf38
-    - python: 3.4
-      env: TOXENV=py34-df21-django20-drf37
-    - python: 3.4
-      env: TOXENV=py34-df21-django20-drf38
-    - python: 3.4
-      env: TOXENV=py34-df21-django20-drf39
-    - python: 3.4
-      env: TOXENV=py34-df21-django20-drfmaster
-
-    - python: 3.5
-      env: TOXENV=py35-df21-django111-drf36
-    - python: 3.5
-      env: TOXENV=py35-df21-django111-drf37
-    - python: 3.5
-      env: TOXENV=py35-df21-django111-drf38
     - python: 3.5
-      env: TOXENV=py35-df21-django20-drf37
+      env: TOXENV=py35-django111-drf39
     - python: 3.5
-      env: TOXENV=py35-df21-django20-drf38
+      env: TOXENV=py35-django111-drfmaster
     - python: 3.5
-      env: TOXENV=py35-df21-django20-drf39
+      env: TOXENV=py35-django21-drf39
     - python: 3.5
-      env: TOXENV=py35-df21-django20-drfmaster
-    - python: 3.5
-      env: TOXENV=py35-df21-django21-drf39
-    - python: 3.5
-      env: TOXENV=py35-df21-django21-drfmaster
+      env: TOXENV=py35-django21-drfmaster
     - python: 3.5
       dist: xenial
-      env: TOXENV=py35-df21-django22-drf39
+      env: TOXENV=py35-django22-drf39
     - python: 3.5
       dist: xenial
-      env: TOXENV=py35-df21-django22-drfmaster
+      env: TOXENV=py35-django22-drfmaster
 
     - python: 3.6
-      env: TOXENV=py36-df21-django111-drf36
-    - python: 3.6
-      env: TOXENV=py36-df21-django111-drf37
-    - python: 3.6
-      env: TOXENV=py36-df21-django111-drf38
+      env: TOXENV=py36-django111-drf39
     - python: 3.6
-      env: TOXENV=py36-df21-django20-drf37
+      env: TOXENV=py36-django111-drfmaster
     - python: 3.6
-      env: TOXENV=py36-df21-django20-drf38
+      env: TOXENV=py36-django21-drf39
     - python: 3.6
-      env: TOXENV=py36-df21-django20-drf39
-    - python: 3.6
-      env: TOXENV=py36-df21-django20-drfmaster
-    - python: 3.6
-      env: TOXENV=py36-df21-django21-drf39
-    - python: 3.6
-      env: TOXENV=py36-df21-django21-drfmaster
+      env: TOXENV=py36-django21-drfmaster
     - python: 3.6
       dist: xenial
-      env: TOXENV=py36-df21-django22-drf39
+      env: TOXENV=py36-django22-drf39
     - python: 3.6
       dist: xenial
-      env: TOXENV=py36-df21-django22-drfmaster
+      env: TOXENV=py36-django22-drfmaster
 
     - python: 3.7
       dist: xenial
       sudo: required
-      env: TOXENV=py37-df21-django20-drf39
-    - python: 3.7
-      dist: xenial
-      sudo: required
-      env: TOXENV=py37-df21-django20-drfmaster
-    - python: 3.7
-      dist: xenial
-      sudo: required
-      env: TOXENV=py37-df21-django21-drf39
+      env: TOXENV=py37-django21-drf39
     - python: 3.7
       dist: xenial
       sudo: required
-      env: TOXENV=py37-df21-django21-drfmaster
+      env: TOXENV=py37-django21-drfmaster
     - python: 3.7
       dist: xenial
       sudo: required
-      env: TOXENV=py37-df21-django22-drf39
+      env: TOXENV=py37-django22-drf39
     - python: 3.7
       dist: xenial
       sudo: required
-      env: TOXENV=py37-df21-django22-drfmaster
+      env: TOXENV=py37-django22-drfmaster
 install:
   - pip install tox
 script:

README.rst

@@ -87,9 +87,9 @@ As a Django REST Framework JSON API (short DJA) we are trying to address followi
 Requirements
 ------------
 
-1. Python (2.7, 3.4, 3.5, 3.6, 3.7)
-2. Django (1.11, 2.0, 2.1, 2.2)
-3. Django REST Framework (3.6, 3.7, 3.8, 3.9)
+1. Python (3.5, 3.6, 3.7)
+2. Django (1.11, 2.1, 2.2)
+3. Django REST Framework (3.9)
 
 ------------
 Installation

docs/getting-started.md

@@ -51,9 +51,9 @@ like the following:
 
 ## Requirements
 
-1. Python (2.7, 3.4, 3.5, 3.6, 3.7)
-2. Django (1.11, 2.0, 2.1, 2.2)
-3. Django REST Framework (3.6, 3.7, 3.8, 3.9)
+1. Python (3.5, 3.6, 3.7)
+2. Django (1.11, 2.1, 2.2)
+3. Django REST Framework (3.9)
 
 ## Installation
 

example/api/resources/identity.py

@@ -1,7 +1,7 @@
 from django.contrib.auth import models as auth_models
 from django.utils import encoding
 from rest_framework import generics, parsers, renderers, serializers, viewsets
-from rest_framework.decorators import detail_route, list_route
+from rest_framework.decorators import action
 from rest_framework.response import Response
 
 from rest_framework_json_api import mixins, utils
@@ -15,7 +15,7 @@ class Identity(mixins.MultipleIDMixin, viewsets.ModelViewSet):
     serializer_class = IdentitySerializer
 
     # demonstrate sideloading data for use at app boot time
-    @list_route()
+    @action(detail=False)
     def posts(self, request):
         self.resource_name = False
 
@@ -28,12 +28,12 @@ def posts(self, request):
         }
         return Response(utils.format_field_names(data, format_type='camelize'))
 
-    @detail_route()
+    @action(detail=True)
     def manual_resource_name(self, request, *args, **kwargs):
         self.resource_name = 'data'
         return super(Identity, self).retrieve(request, args, kwargs)
 
-    @detail_route()
+    @action(detail=True)
     def validation(self, request, *args, **kwargs):
         raise serializers.ValidationError('Oh nohs!')
 

example/models.py

@@ -4,7 +4,6 @@
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from polymorphic.models import PolymorphicModel
 
 
@@ -32,7 +31,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class Blog(BaseModel):
     name = models.CharField(max_length=100)
     tagline = models.TextField()
@@ -45,7 +43,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class AuthorType(BaseModel):
     name = models.CharField(max_length=50)
 
@@ -56,7 +53,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class Author(BaseModel):
     name = models.CharField(max_length=50)
     email = models.EmailField()
@@ -69,7 +65,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class AuthorBio(BaseModel):
     author = models.OneToOneField(Author, related_name='bio', on_delete=models.CASCADE)
     body = models.TextField()
@@ -81,7 +76,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class AuthorBioMetadata(BaseModel):
     """
     Just a class to have a relation with author bio
@@ -96,7 +90,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class Entry(BaseModel):
     blog = models.ForeignKey(Blog, on_delete=models.CASCADE)
     headline = models.CharField(max_length=255)
@@ -116,7 +109,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class Comment(BaseModel):
     entry = models.ForeignKey(Entry, related_name='comments', on_delete=models.CASCADE)
     body = models.TextField()
@@ -135,7 +127,6 @@ class Meta:
         ordering = ('id',)
 
 
-@python_2_unicode_compatible
 class ProjectType(BaseModel):
     name = models.CharField(max_length=50)
 
@@ -160,7 +151,6 @@ class ResearchProject(Project):
     supervisor = models.CharField(max_length=30)
 
 
-@python_2_unicode_compatible
 class Company(models.Model):
     name = models.CharField(max_length=100)
     current_project = models.ForeignKey(

example/tests/integration/test_non_paginated_responses.py

@@ -1,11 +1,8 @@
+from unittest import mock
+
 import pytest
 from django.urls import reverse
 
-try:
-    from unittest import mock
-except ImportError:  # pragma: no cover
-    import mock
-
 pytestmark = pytest.mark.django_db
 
 

example/tests/integration/test_pagination.py

@@ -1,12 +1,8 @@
+from unittest import mock
+
 import pytest
 from django.urls import reverse
 
-try:
-    from unittest import mock
-except ImportError:  # pragma: no cover
-    import mock
-
-
 pytestmark = pytest.mark.django_db
 
 

example/tests/test_serializers.py

@@ -1,3 +1,5 @@
+from unittest import mock
+
 import pytest
 from django.test import TestCase
 from django.urls import reverse
@@ -15,11 +17,6 @@
 from example.models import Author, Blog, Entry
 from example.serializers import BlogSerializer
 
-try:
-    from unittest import mock
-except ImportError:  # pragma: no cover
-    import mock
-
 request_factory = APIRequestFactory()
 pytestmark = pytest.mark.django_db
 

example/views.py

@@ -140,7 +140,6 @@ class NonPaginatedEntryViewSet(EntryViewSet):
         'blog__name': rels,
         'blog__tagline': rels,
     }
-    filter_fields = filterset_fields  # django-filter<=1.1  (required for py27)
     search_fields = ('headline', 'body_text', 'blog__name', 'blog__tagline')
 
 
@@ -160,8 +159,6 @@ class FiltersetEntryViewSet(EntryViewSet):
     pagination_class = NoPagination
     filterset_fields = None
     filterset_class = EntryFilter
-    filter_fields = filterset_fields  # django-filter<=1.1
-    filter_class = filterset_class
 
 
 class NoFiltersetEntryViewSet(EntryViewSet):
@@ -171,8 +168,6 @@ class NoFiltersetEntryViewSet(EntryViewSet):
     pagination_class = NoPagination
     filterset_fields = None
     filterset_class = None
-    filter_fields = filterset_fields  # django-filter<=1.1
-    filter_class = filterset_class
 
 
 class AuthorViewSet(ModelViewSet):

pytest.ini

@@ -4,14 +4,4 @@ filterwarnings =
     error::DeprecationWarning
     error::PendingDeprecationWarning
     # TODO: restructure tests so this can be ignored on a test level
-    ignore:MarkInfo objects are deprecated as they contain merged marks which are hard to deal with correctly.
-    ignore:use of getfuncargvalue is deprecated, use getfixturevalue
-    ignore:`list_route`
-    ignore:`detail_route`
-    ignore:`FiltersetEntryViewSet.filter_fields` attribute should be renamed
-    ignore:`NoFiltersetEntryViewSet.filter_fields` attribute should be renamed
-    ignore:`NoFiltersetEntryViewSet.filter_class` attribute should be renamed `filterset_class`
     ignore:MultipleIDMixin is deprecated
-    # can be removed once following DRF PR is released
-    # https://github.com/encode/django-rest-framework/pull/6268
-    ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated

requirements-development.txt

@@ -7,7 +7,6 @@ factory-boy==2.12.0
 flake8==3.7.7
 flake8-isort==2.7.0
 isort==4.3.21
-mock==3.0.5
 pytest==4.6.3
 pytest-cov==2.7.1
 pytest-django==3.5.0