diff --git a/.travis.yml b/.travis.yml index a621d1d..f59dac9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,8 @@ language: python python: "3.6" env: - - TOXENV=py27-django110 - TOXENV=py27-django111 - - TOXENV=py34-django110 - TOXENV=py34-django111 - - TOXENV=py35-django110 - TOXENV=py35-django111 - TOXENV=py35-djangomaster - TOXENV=py36-django111 @@ -24,15 +21,11 @@ services: matrix: fast_finish: true include: - - python: "3.5" - env: TOXENV=py35-django110 - python: "3.5" env: TOXENV=py35-django111 - python: "3.5" env: TOXENV=py35-djangomaster exclude: - - python: "3.6" - env: TOXENV=py35-django110 - python: "3.6" env: TOXENV=py35-django111 - python: "3.6" diff --git a/docs/changelog.rst b/docs/changelog.rst index bc242ab..9e4c46e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,7 +4,7 @@ Changelog Changes in git -------------- -* **BACKWARDS INCOMPATIBILITY:** Dropped Django 1.8 support. +* **BACKWARDS INCOMPATIBILITY:** Dropped Django 1.8 and 1.10 support. * **BACKWARDS INCOMPATIBILITY:** Removed old deprecated code from 1.0, thus: * Import managers from ``polymorphic.managers`` (plural), not ``polymorphic.manager``. diff --git a/tox.ini b/tox.ini index f8e95a8..4d4cb8a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = - py27-django{110,111} - py34-django{110,111} - py35-django{110,111,master} + py27-django{111} + py34-django{111} + py35-django{111,master} py36-django{111,master} docs @@ -14,7 +14,6 @@ setenv = deps = coverage dj-database-url - django110: Django >= 1.10, < 1.11 django111: Django >= 1.11, < 2.0 djangomaster: https://github.com/django/django/archive/master.tar.gz postgres: psycopg2