Merge branch 'master' into develop

sergei-maertens · Apr 3, 2016 · 7fce594 · 7fce594
2 parents fdea31b + 3aa5a4d
commit 7fce594
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,9 +36,6 @@ env:
   - TOXENV=py34-django19
   - TOXENV=py34-djangolatest
 
-  - TOXENV=py35-django15
-  - TOXENV=py35-django16
-  - TOXENV=py35-django17
   - TOXENV=py35-django18
   - TOXENV=py35-django19
   - TOXENV=py35-djangolatest

diff --git a/docs/index.rst b/docs/index.rst
@@ -40,8 +40,8 @@ Requirements
 
 Django choices is fairly simple, so most Python and Django
 versions should work. Django choices is tested against Python
-2.6, 2.7, 3.3, 3.4 and PyPy. Django 1.3 until 1.8 (including)
-are officially supported.
+2.6, 2.7, 3.3, 3.4, 3.5 and PyPy. Django 1.3 until 1.9 (including)
+are officially supported (= tested in Travis).
 
 
 Quick-start

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{26,27}-django{13,14,15,16},py27-django{17,18,19,latest},py{33,34,35,py}-django{15,16,17,18,19,latest}
+envlist = py{26,27}-django{13,14,15,16},py27-django{17,18,19,latest},py{33,34,py}-django{15,16,17,18,latest},py{35,py}-django{18,19,latest}
 skip_missing_interpreters = true
 
 [testenv]