Add Django 2.2 support

Author: sliverc

.travis.yml

@@ -11,6 +11,9 @@ matrix:
     - env: TOXENV=py35-df20-django21-drfmaster
     - env: TOXENV=py36-df20-django21-drfmaster
     - env: TOXENV=py37-df20-django21-drfmaster
+    - env: TOXENV=py35-df20-django22-drfmaster
+    - env: TOXENV=py36-df20-django22-drfmaster
+    - env: TOXENV=py37-df20-django22-drfmaster
 
   include:
     - python: 3.6
@@ -58,6 +61,10 @@ matrix:
       env: TOXENV=py35-df20-django21-drf39
     - python: 3.5
       env: TOXENV=py35-df20-django21-drfmaster
+    - python: 3.5
+      env: TOXENV=py35-df20-django22-drf39
+    - python: 3.5
+      env: TOXENV=py35-df20-django22-drfmaster
 
     - python: 3.6
       env: TOXENV=py36-df20-django111-drf36
@@ -77,6 +84,10 @@ matrix:
       env: TOXENV=py36-df20-django21-drf39
     - python: 3.6
       env: TOXENV=py36-df20-django21-drfmaster
+    - python: 3.6
+      env: TOXENV=py36-df20-django22-drf39
+    - python: 3.6
+      env: TOXENV=py36-df20-django22-drfmaster
 
     - python: 3.7
       dist: xenial
@@ -94,6 +105,14 @@ matrix:
       dist: xenial
       sudo: required
       env: TOXENV=py37-df20-django21-drfmaster
+    - python: 3.7
+      dist: xenial
+      sudo: required
+      env: TOXENV=py37-df20-django22-drf39
+    - python: 3.7
+      dist: xenial
+      sudo: required
+      env: TOXENV=py37-df20-django22-drfmaster
 install:
   - pip install tox
 script:

CHANGELOG.md

@@ -10,6 +10,10 @@ any parts of the framework not mentioned in the documentation should generally b
 
 ## [Unreleased]
 
+### Added
+
+* Add support for Django 2.2
+
 ### Fixed
 
 * Avoid exception when trying to include skipped relationship

README.rst

@@ -88,7 +88,7 @@ Requirements
 ------------
 
 1. Python (2.7, 3.4, 3.5, 3.6, 3.7)
-2. Django (1.11, 2.0, 2.1)
+2. Django (1.11, 2.0, 2.1, 2.2)
 3. Django REST Framework (3.6, 3.7, 3.8, 3.9)
 
 ------------

docs/getting-started.md

@@ -52,7 +52,7 @@ 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. Django (1.11, 2.0, 2.1, 2.2)
 3. Django REST Framework (3.6, 3.7, 3.8, 3.9)
 
 ## Installation

setup.py

@@ -92,6 +92,7 @@ def get_package_data(package):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',

tox.ini

@@ -11,6 +11,7 @@ deps =
     django111: Django>=1.11,<1.12
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
     drf36: djangorestframework>=3.6.3,<3.7
     drf37: djangorestframework>=3.7.0,<3.8
     drf38: djangorestframework>=3.8.0,<3.9