Merge pull request #31 from edmorley/update-testing-matrix

Add testing against Django 1.10+, django-rest-framework 3.4/3.5 & Python 3.6

.travis.yml

@@ -8,19 +8,59 @@ language: python
 # https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
 python: "3.5"
 env:
+    # Keep in sync with tox.ini.
+
     - TOX_ENV=docs
 
-    - TOX_ENV=py27-django1.8-drf3.2
-    - TOX_ENV=py27-django1.8-drf3.3
-    - TOX_ENV=py27-django1.9-drf3.3
+    - TOX_ENV=py27-django1.8-drf3.4
+    - TOX_ENV=py27-django1.8-drf3.5
+    - TOX_ENV=py27-django1.9-drf3.4
+    - TOX_ENV=py27-django1.9-drf3.5
+    - TOX_ENV=py27-django1.10-drf3.4
+    - TOX_ENV=py27-django1.10-drf3.5
+    - TOX_ENV=py27-django1.11-drf3.5
 
-    - TOX_ENV=py34-django1.8-drf3.2
-    - TOX_ENV=py34-django1.8-drf3.3
-    - TOX_ENV=py34-django1.9-drf3.3
+    - TOX_ENV=py34-django1.8-drf3.4
+    - TOX_ENV=py34-django1.8-drf3.5
+    - TOX_ENV=py34-django1.9-drf3.4
+    - TOX_ENV=py34-django1.9-drf3.5
+    - TOX_ENV=py34-django1.10-drf3.4
+    - TOX_ENV=py34-django1.10-drf3.5
+    - TOX_ENV=py34-django1.11-drf3.5
 
-    - TOX_ENV=py35-django1.8-drf3.2
-    - TOX_ENV=py35-django1.8-drf3.3
-    - TOX_ENV=py35-django1.9-drf3.3
+    - TOX_ENV=py35-django1.8-drf3.4
+    - TOX_ENV=py35-django1.8-drf3.5
+    - TOX_ENV=py35-django1.9-drf3.4
+    - TOX_ENV=py35-django1.9-drf3.5
+    - TOX_ENV=py35-django1.10-drf3.4
+    - TOX_ENV=py35-django1.10-drf3.5
+    - TOX_ENV=py35-django1.11-drf3.5
+    - TOX_ENV=py35-djangomaster-drf3.5
+matrix:
+  include:
+    # Python 3.6 has to be specified explicitly since it's not installed by default.
+    - python: 3.6
+      env: TOX_ENV=py36-django1.11-drf3.5
+    - python: 3.6
+      env: TOX_ENV=py36-djangomaster-drf3.5
+  allow_failures:
+    # Tests currently fail under Django 1.10+ (see #30).
+    - env: TOX_ENV=py27-django1.10-drf3.4
+    - env: TOX_ENV=py27-django1.10-drf3.5
+    - env: TOX_ENV=py27-django1.11-drf3.5
+    - env: TOX_ENV=py34-django1.10-drf3.4
+    - env: TOX_ENV=py34-django1.10-drf3.5
+    - env: TOX_ENV=py34-django1.11-drf3.5
+    - env: TOX_ENV=py35-django1.10-drf3.4
+    - env: TOX_ENV=py35-django1.10-drf3.5
+    - env: TOX_ENV=py35-django1.11-drf3.5
+    - python: 3.6
+      env: TOX_ENV=py36-django1.11-drf3.5
+    # Django master is allowed to fail.
+    - env: TOX_ENV=py35-djangomaster-drf3.5
+    - python: 3.6
+      env: TOX_ENV=py36-djangomaster-drf3.5
+  fast_finish: true
 install:
     - pip install tox
 script:

docs/index.rst

@@ -52,7 +52,7 @@ Requirements:
 
 * Python 2.7+ or 3.4+
 * `Django`_ 1.8 through 1.9
-* `Django Rest Framework`_ 3.2 or 3.3
+* `Django Rest Framework`_ 3.4 or 3.5
 * `mohawk`_
 (Older versions of these libraries may work, but support is not guaranteed.)
 
@@ -96,6 +96,8 @@ Changelog
 - **Unreleased**
 
   - Dropped support for Django 1.6/1.7.
+  - Dropped support for django-rest-framework 3.2/3.3.
+  - Confirmed support for django-rest-framework 3.4/3.5.
 
 - **0.0.10** (2016-06-01)
 

setup.py

@@ -11,6 +11,9 @@
       url='https://github.com/kumar303/hawkrest',
       include_package_data=True,
       classifiers=[
+          'Framework :: Django',
+          'Framework :: Django :: 1.8',
+          'Framework :: Django :: 1.9',
           'Intended Audience :: Developers',
           'Natural Language :: English',
           'Operating System :: OS Independent',
@@ -19,6 +22,7 @@
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
           'Topic :: Internet :: WWW/HTTP',
       ],
       packages=find_packages(exclude=['tests']),

tox.ini

@@ -4,17 +4,23 @@
 # When updating the envlist, be sure to also update TOX_ENV in .travis.yml
 envlist =
     docs,
-    {py27,py34,py35}-django1.8-drf{3.2,3.3}
-    # Django 1.9 requires DRF >= 3.3
-    {py27,py34,py35}-django1.9-drf3.3
+    py{27,34,35}-django{1.8,1.9,1.10}-drf{3.4,3.5},
+    # Django 1.11+ is only supported as of django-rest-framework 3.5.
+    # Python 3.6 is only supported as of Django 1.11.
+    py{27,34,35,36}-django1.11-drf3.5,
+    # Django master dropped support for Python <3.5.
+    py{35,36}-djangomaster-drf3.5,
 
 [testenv]
 commands = {envpython} runtests.py []
 deps =
     django1.8: Django>=1.8,<1.9
     django1.9: Django>=1.9,<1.10
-    drf3.2: djangorestframework>=3.2,<3.3
-    drf3.3: djangorestframework>=3.3,<3.4
+    django1.10: Django>=1.10,<1.11
+    django1.11: Django>=1.11a1,<2.0
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
+    drf3.4: djangorestframework>=3.4,<3.5
+    drf3.5: djangorestframework>=3.5,<3.6
     -r{toxinidir}/requirements/dev.txt
 setenv =
     PYTHONDONTWRITEBYTECODE=1