Add testing for Django 2.0

jazzband · Oct 4, 2017 · 28d424c · 28d424c
1 parent e01b9ad
commit 28d424c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ env:
     - TOXENV=py34-django-19
     - TOXENV=py34-django-110
     - TOXENV=py34-django-111
+    - TOXENV=py34-django-20
   global:
     - PIP_WHEEL_DIR=$HOME/.wheels
     - PIP_FIND_LINKS=file://$HOME/.wheels
@@ -22,10 +23,14 @@ matrix:
       env: TOXENV=py35-django-110
     - python: 3.5
       env: TOXENV=py35-django-111
+    - python: 3.5
+      env: TOXENV=py35-django-20
     - python: 3.5
       env: TOXENV=py35-django-master
     - python: 3.6
       env: TOXENV=py36-django-111
+    - python: 3.6
+      env: TOXENV=py36-django-20
     - python: 3.6
       env: TOXENV=py36-django-master
 install:

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,6 +8,8 @@ X.Y (YYYY-MM-DD)
 
 - Added testing for Django 1.11 (no code changes were required).
 
+- Added support for Django 2.0.
+
 - Dropped testing for Python 3.3 (now end-of-life) on Django 1.8.
 
 2.0 (2017-01-07)

diff --git a/setup.py b/setup.py
@@ -130,6 +130,7 @@ def find_package_data(where='.', package='',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',

diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,9 @@
 args_are_paths = false
 envlist =
     {py27,py34}-django-{18,19,110,111}
-    py35-django-{18,19,110,111,master}
-    py36-django-{111,master}
+    py34-django-20
+    py35-django-{18,19,110,111,20,master}
+    py36-django-{111,20,master}
 
 [testenv]
 basepython =
@@ -20,5 +21,6 @@ deps =
     django-19: Django>=1.9,<1.10
     django-110: Django>=1.10a1,<1.11
     django-111: Django>=1.11a1,<2.0
+    django-20: Django>=2.0a1,<2.1
     django-master: https://github.com/django/django/archive/master.tar.gz
     -r{toxinidir}/tests/requirements.txt