Update compatibility matrix for Python, Django, and DRF

.gitignore

@@ -37,3 +37,5 @@ pip-delete-this-directory.txt
 
 # VirtualEnv
 .venv/
+
+*.sw*

.travis.yml

@@ -10,11 +10,18 @@ matrix:
       env: DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
     - python: "3.3"
       env: DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
+    - python: "3.3"
+      env: DJANGO=">=1.11,<1.12" DRF=">=3.4,<3.5"
+    - python: "3.3"
+      env: DJANGO=">=1.11,<1.12" DRF=">=3.5,<3.6"
+    - python: "3.3"
+      env: DJANGO=">=1.11,<1.12" DRF=">=3.6,<3.7"
 python:
   - "2.7"
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 env:
   - DJANGO=">=1.8,<1.9" DRF=">=3.1,<3.2"
   - DJANGO=">=1.8,<1.9" DRF=">=3.2,<3.3"
@@ -25,6 +32,10 @@ env:
   - DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
 
   - DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
+
+  - DJANGO=">=1.11,<1.12" DRF=">=3.4,<3.5"
+  - DJANGO=">=1.11,<1.12" DRF=">=3.5,<3.6"
+  - DJANGO=">=1.11,<1.12" DRF=">=3.6,<3.7"
 before_install:
   # Force an upgrade of py & pytest to avoid VersionConflict
   - pip install --upgrade py

CHANGELOG.md

@@ -1,3 +1,8 @@
+v2.2.0
+
+* Add support for Django REST Framework 3.5 and 3.6
+* Add support for Django 1.11
+* Add support for Python 3.6
 
 v2.1.1
 

README.rst

@@ -18,11 +18,15 @@ JSON API and Django Rest Framework
    :target: https://gitter.im/django-json-api/django-rest-framework-json-api
 
 
-Documentation: http://django-rest-framework-json-api.readthedocs.org/
+--------
+Overview
+--------
 
-Live demo (resets every hour): http://json-api.jerel.co/
+**JSON API support for Django REST Framework**
 
-Format specification: http://jsonapi.org/format/
+* Documentation: http://django-rest-framework-json-api.readthedocs.org/
+* Live demo (resets every hour): http://json-api.jerel.co/
+* Format specification: http://jsonapi.org/format/
 
 
 By default, Django REST Framework will produce a response like::
@@ -68,8 +72,9 @@ like the following::
 Requirements
 ------------
 
-1. Django
-2. Django REST Framework
+1. Python (2.7, 3.3, 3.4, 3.5, 3.6)
+2. Django (1.8, 1.9, 1.10, 1.11)
+3. Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6)
 
 ------------
 Installation

docs/getting-started.md

@@ -51,15 +51,15 @@ like the following:
 
 ## Requirements
 
-1. Python >= 2.7
-2. Django
-3. Django REST Framework >= 3.1
+1. Python (2.7, 3.3, 3.4, 3.5, 3.6)
+2. Django (1.8, 1.9, 1.10, 1.11)
+3. Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6)
 
 ## Installation
 
 From PyPI
 
-    pip install djangorestframework-jsonapi==2.0.0-beta.1
+    pip install djangorestframework-jsonapi
 
 From Source
 

setup.py

@@ -72,7 +72,7 @@ def get_package_data(package):
     version=get_version('rest_framework_json_api'),
     url='https://github.com/django-json-api/django-rest-framework-json-api',
     license='MIT',
-    description='A Django REST framework API adapter for the json-api spec.',
+    description='A Django REST framework API adapter for the JSON API spec.',
     long_description=read('README.rst'),
     author='Jerel Unruh',
     author_email='',
@@ -92,6 +92,7 @@ def get_package_data(package):
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',