encode · carltongibson · Feb 14, 2019 · Feb 14, 2019 · Feb 14, 2019 · Feb 14, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -39,7 +39,6 @@ matrix:
 
     allow_failures:
       - env: DJANGO=master
-      - env: DJANGO=2.2
 
 install:
     - pip install tox tox-venv tox-travis

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (2.7, 3.4, 3.5, 3.6, 3.7)
-* Django (1.11, 2.0, 2.1)
+* Django (1.11, 2.0, 2.1, 2.2)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.

diff --git a/docs/index.md b/docs/index.md
@@ -87,7 +87,7 @@ continued development by **[signing up for a paid plan][funding]**.
 REST framework requires the following:
 
 * Python (2.7, 3.4, 3.5, 3.6, 3.7)
-* Django (1.11, 2.0, 2.1)
+* Django (1.11, 2.0, 2.1, 2.2)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.

diff --git a/setup.py b/setup.py
@@ -61,6 +61,7 @@ def get_version(package):
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',

diff --git a/tests/authentication/__init__.py b/tests/authentication/__init__.py
diff --git a/tests/authentication/migrations/0001_initial.py b/tests/authentication/migrations/0001_initial.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CustomToken',
+            fields=[
+                ('key', models.CharField(max_length=40, primary_key=True, serialize=False)),
+                ('user', models.OneToOneField(on_delete=models.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/tests/authentication/migrations/__init__.py b/tests/authentication/migrations/__init__.py
diff --git a/tests/authentication/models.py b/tests/authentication/models.py
@@ -0,0 +1,10 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import models
+
+
+class CustomToken(models.Model):
+    key = models.CharField(max_length=40, primary_key=True)
+    user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
diff --git a/tests/test_authentication.py → tests/authentication/test_authentication.py b/tests/test_authentication.py → tests/authentication/test_authentication.py
@@ -8,7 +8,6 @@
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib.auth.models import User
-from django.db import models
 from django.http import HttpResponse
 from django.test import TestCase, override_settings
 from django.utils import six
@@ -26,12 +25,9 @@
 from rest_framework.test import APIClient, APIRequestFactory
 from rest_framework.views import APIView
 
-factory = APIRequestFactory()
-
+from .models import CustomToken
 
-class CustomToken(models.Model):
-    key = models.CharField(max_length=40, primary_key=True)
-    user = models.OneToOneField(User, on_delete=models.CASCADE)
+factory = APIRequestFactory()
 
 
 class CustomTokenAuthentication(TokenAuthentication):
@@ -87,7 +83,7 @@ def put(self, request):
 ]
 
 
-@override_settings(ROOT_URLCONF='tests.test_authentication')
+@override_settings(ROOT_URLCONF=__name__)
 class BasicAuthTests(TestCase):
     """Basic authentication"""
     def setUp(self):
@@ -169,7 +165,7 @@ def test_fail_post_if_credentials_contain_spaces(self):
         assert response.status_code == status.HTTP_401_UNAUTHORIZED
 
 
-@override_settings(ROOT_URLCONF='tests.test_authentication')
+@override_settings(ROOT_URLCONF=__name__)
 class SessionAuthTests(TestCase):
     """User session authentication"""
     def setUp(self):
@@ -370,7 +366,7 @@ def test_post_json_failing_token_auth(self):
         assert response.status_code == status.HTTP_401_UNAUTHORIZED
 
 
-@override_settings(ROOT_URLCONF='tests.test_authentication')
+@override_settings(ROOT_URLCONF=__name__)
 class TokenAuthTests(BaseTokenAuthTests, TestCase):
     model = Token
     path = '/token/'
@@ -429,13 +425,13 @@ def test_token_login_form(self):
         assert response.data['token'] == self.key
 
 
-@override_settings(ROOT_URLCONF='tests.test_authentication')
+@override_settings(ROOT_URLCONF=__name__)
 class CustomTokenAuthTests(BaseTokenAuthTests, TestCase):
     model = CustomToken
     path = '/customtoken/'
 
 
-@override_settings(ROOT_URLCONF='tests.test_authentication')
+@override_settings(ROOT_URLCONF=__name__)
 class CustomKeywordTokenAuthTests(BaseTokenAuthTests, TestCase):
     model = Token
     path = '/customkeywordtoken/'
@@ -549,7 +545,7 @@ class MockUser(object):
         authentication.authenticate = old_authenticate
 
 
-@override_settings(ROOT_URLCONF='tests.test_authentication',
+@override_settings(ROOT_URLCONF=__name__,
                    AUTHENTICATION_BACKENDS=('django.contrib.auth.backends.RemoteUserBackend',))
 class RemoteUserAuthenticationUnitTests(TestCase):
     def setUp(self):

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -56,6 +56,8 @@ def pytest_configure(config):
             'django.contrib.staticfiles',
             'rest_framework',
             'rest_framework.authtoken',
+            'tests.authentication',
+            'tests.generic_relations',
             'tests.importable',
             'tests',
         ),

diff --git a/tests/generic_relations/__init__.py b/tests/generic_relations/__init__.py
diff --git a/tests/generic_relations/migrations/0001_initial.py b/tests/generic_relations/migrations/0001_initial.py
@@ -0,0 +1,36 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Bookmark',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('url', models.URLField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Note',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('tag', models.SlugField()),
+                ('object_id', models.PositiveIntegerField()),
+                ('content_type', models.ForeignKey(on_delete=models.CASCADE, to='contenttypes.ContentType')),
+            ],
+        ),
+    ]
diff --git a/tests/generic_relations/migrations/__init__.py b/tests/generic_relations/migrations/__init__.py
diff --git a/tests/generic_relations/models.py b/tests/generic_relations/models.py
@@ -0,0 +1,46 @@
+from __future__ import unicode_literals
+
+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
+
+
+@python_2_unicode_compatible
+class Tag(models.Model):
+    """
+    Tags have a descriptive slug, and are attached to an arbitrary object.
+    """
+    tag = models.SlugField()
+    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    object_id = models.PositiveIntegerField()
+    tagged_item = GenericForeignKey('content_type', 'object_id')
+
+    def __str__(self):
+        return self.tag
+
+
+@python_2_unicode_compatible
+class Bookmark(models.Model):
+    """
+    A URL bookmark that may have multiple tags attached.
+    """
+    url = models.URLField()
+    tags = GenericRelation(Tag)
+
+    def __str__(self):
+        return 'Bookmark: %s' % self.url
+
+
+@python_2_unicode_compatible
+class Note(models.Model):
+    """
+    A textual note that may have multiple tags attached.
+    """
+    text = models.TextField()
+    tags = GenericRelation(Tag)
+
+    def __str__(self):
+        return 'Note: %s' % self.text
diff --git a/tests/test_relations_generic.py → ...neric_relations/test_generic_relations.py b/tests/test_relations_generic.py → ...neric_relations/test_generic_relations.py
@@ -1,52 +1,10 @@
 from __future__ import unicode_literals
 
-from django.contrib.contenttypes.fields import (
-    GenericForeignKey, GenericRelation
-)
-from django.contrib.contenttypes.models import ContentType
-from django.db import models
 from django.test import TestCase
-from django.utils.encoding import python_2_unicode_compatible
 
 from rest_framework import serializers
 
-
-@python_2_unicode_compatible
-class Tag(models.Model):
-    """
-    Tags have a descriptive slug, and are attached to an arbitrary object.
-    """
-    tag = models.SlugField()
-    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    object_id = models.PositiveIntegerField()
-    tagged_item = GenericForeignKey('content_type', 'object_id')
-
-    def __str__(self):
-        return self.tag
-
-
-@python_2_unicode_compatible
-class Bookmark(models.Model):
-    """
-    A URL bookmark that may have multiple tags attached.
-    """
-    url = models.URLField()
-    tags = GenericRelation(Tag)
-
-    def __str__(self):
-        return 'Bookmark: %s' % self.url
-
-
-@python_2_unicode_compatible
-class Note(models.Model):
-    """
-    A textual note that may have multiple tags attached.
-    """
-    text = models.TextField()
-    tags = GenericRelation(Tag)
-
-    def __str__(self):
-        return 'Note: %s' % self.text
+from .models import Bookmark, Note, Tag
 
 
 class TestGenericRelations(TestCase):

diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -221,7 +221,7 @@ def setUp(self):
         # ...
         for idx in range(3):
             label = 'w' * (idx + 1)
-            AttributeModel(label=label)
+            AttributeModel.objects.create(label=label)
 
         for idx in range(10):
             title = 'z' * (idx + 1)

diff --git a/tox.ini b/tox.ini
@@ -25,7 +25,7 @@ deps =
         django111: Django>=1.11,<2.0
         django20: Django>=2.0,<2.1
         django21: Django>=2.1,<2.2
-        django22: Django>=2.2a1,<3.0
+        django22: Django>=2.2b1,<3.0
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt