From bf2c616267452d2f84a0deab06afd0333be6d248 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 3 Feb 2017 08:37:32 -0500 Subject: [PATCH] Add testing for Django 1.11 --- .travis.yml | 3 +++ docs/changelog.rst | 4 ++++ setup.py | 1 + tox.ini | 5 +++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05ac3ee..ccb3836 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,16 @@ env: - TOXENV=py27-django-18 - TOXENV=py27-django-19 - TOXENV=py27-django-110 + - TOXENV=py27-django-111 - TOXENV=py33-django-18 - TOXENV=py34-django-18 - TOXENV=py34-django-19 - TOXENV=py34-django-110 + - TOXENV=py34-django-111 - TOXENV=py35-django-18 - TOXENV=py35-django-19 - TOXENV=py35-django-110 + - TOXENV=py35-django-111 - TOXENV=py35-django-master global: - PIP_WHEEL_DIR=$HOME/.wheels diff --git a/docs/changelog.rst b/docs/changelog.rst index 678f288..58f7fbc 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -3,6 +3,10 @@ Changelog This page details the changes in the various ``django-formtools`` releases. +X.Y (YYYY-MM-DD) +---------------- + +- Added testing for Django 1.11 (no code changes were required). 2.0 (2017-01-07) ---------------- diff --git a/setup.py b/setup.py index 4bcb18f..1b56665 100644 --- a/setup.py +++ b/setup.py @@ -129,6 +129,7 @@ setup( 'Framework :: Django :: 1.8', 'Framework :: Django :: 1.9', 'Framework :: Django :: 1.10', + 'Framework :: Django :: 1.11', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', diff --git a/tox.ini b/tox.ini index 0e411f1..9a78a78 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] args_are_paths = false envlist = - {py27,py34}-django-{18,19,110} + {py27,py34}-django-{18,19,110,111} py33-django-{18} - py35-django-{18,19,110,master} + py35-django-{18,19,110,111,master} [testenv] basepython = @@ -19,5 +19,6 @@ deps = django-18: Django>=1.8,<1.9 django-19: Django>=1.9,<1.10 django-110: Django>=1.10a1,<1.11 + django-111: Django>=1.11a1,<2.0 django-master: https://github.com/django/django/archive/master.tar.gz -r{toxinidir}/tests/requirements.txt