diff --git a/.travis.yml b/.travis.yml index 59fbfa2..a6f737b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,20 +2,12 @@ sudo: false language: python cache: pip python: - - "2.6" - "2.7" - - "3.2" - - "3.3" - "3.4" - "3.5" - "3.6" env: - - TOXENV="django14" - - TOXENV="django15" - - TOXENV="django16" - - TOXENV="django17" - TOXENV="django18" - - TOXENV="django19" - TOXENV="django110" - TOXENV="django111" - TOXENV="djangodev" @@ -23,77 +15,19 @@ env: matrix: fast_finish: true exclude: - - python: "3.6" - env: TOXENV="django14" - - python: "3.6" - env: TOXENV="django15" - - python: "3.6" - env: TOXENV="django16" - - python: "3.6" - env: TOXENV="django17" - python: "3.6" env: TOXENV="django18" - - python: "3.6" - env: TOXENV="django19" - python: "3.6" env: TOXENV="django110" - - python: "3.5" - env: TOXENV="django14" - - python: "3.5" - env: TOXENV="django15" - - python: "3.5" - env: TOXENV="django16" - - python: "3.5" - env: TOXENV="django17" - - - python: "3.4" - env: TOXENV="django14" - - python: "3.4" - env: TOXENV="django19" - python: "3.4" env: TOXENV="django110" - python: "3.4" env: TOXENV="django111" - - python: "3.3" - env: TOXENV="django14" - - python: "3.3" - env: TOXENV="django19" - - python: "3.3" - env: TOXENV="django110" - - python: "3.3" - env: TOXENV="django111" - - python: "3.3" - env: TOXENV="djangodev" - - - python: "3.2" - env: TOXENV="django14" - - python: "3.2" - env: TOXENV="django19" - - python: "3.2" - env: TOXENV="django110" - - python: "3.2" - env: TOXENV="django111" - - python: "3.2" - env: TOXENV="djangodev" - - python: "2.7" env: TOXENV="djangodev" - - python: "2.6" - env: TOXENV="django17" - - python: "2.6" - env: TOXENV="django18" - - python: "2.6" - env: TOXENV="django19" - - python: "2.6" - env: TOXENV="django110" - - python: "2.6" - env: TOXENV="django111" - - python: "2.6" - env: TOXENV="djangodev" - allow_failures: - env: TOXENV="djangodev" diff --git a/tox.ini b/tox.ini index cff1ea7..5c71b57 100644 --- a/tox.ini +++ b/tox.ini @@ -1,30 +1,22 @@ [tox] -envlist= - py26-django{14,15,16}, - py27-django{14,15,16,17,18,19,110,111}, - py32-django{15,16,17,18}, - py33-django{15,16,17,18}, - py34-django{15,16,17,18,19,110,111}, - py35-django{18,19,110,111,dev}, - py36-django{111,dev}, - docs, +envlist = + py27-django{18,110,111} + py34-django{18,110,111} + py35-django{18,110,111,dev} + py36-django{111,dev} + docs [testenv] deps = coverage == 3.6 - django14: Django >= 1.4, < 1.5 - django15: Django >= 1.5, < 1.6 - django16: Django >= 1.6, < 1.7 - django17: Django >= 1.7, < 1.8 django18: Django >= 1.8, < 1.9 - django19: Django >= 1.9, < 1.10 django110: Django >= 1.10, < 1.11 django111: Django >= 1.11, < 1.12 djangodev: https://github.com/django/django/tarball/master -commands= +commands = coverage run --source polymorphic runtests.py [testenv:docs] -deps=Sphinx +deps = Sphinx changedir = docs commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html