From a01fd92d1c2a65f06dc1f5e4b0e96e459b0d59d8 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Wed, 16 Dec 2015 15:59:25 +0100 Subject: [PATCH] perform Django 1.9 tests on final release, add to tox too --- .travis.yml | 10 +++++----- tox.ini | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f3961c..006d5eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - DJANGO=">=1.6,<1.7" - DJANGO=">=1.7,<1.8" - DJANGO=">=1.8,<1.9" - - DJANGO=">=1.9a1,<1.10" + - DJANGO=">=1.9,<1.10" matrix: exclude: @@ -30,24 +30,24 @@ matrix: - python: "3.4" env: DJANGO=">=1.4,<1.5" - python: "3.4" - env: DJANGO=">=1.9a1,<1.10" + env: DJANGO=">=1.9,<1.10" - python: "3.3" env: DJANGO=">=1.4,<1.5" - python: "3.3" - env: DJANGO=">=1.9a1,<1.10" + env: DJANGO=">=1.9,<1.10" - python: "3.2" env: DJANGO=">=1.4,<1.5" - python: "3.2" - env: DJANGO=">=1.9a1,<1.10" + env: DJANGO=">=1.9,<1.10" - python: "2.6" env: DJANGO=">=1.7,<1.8" - python: "2.6" env: DJANGO=">=1.8,<1.9" - python: "2.6" - env: DJANGO=">=1.9a1,<1.10" + env: DJANGO=">=1.9,<1.10" install: - pip install django$DJANGO coverage==3.6 diff --git a/tox.ini b/tox.ini index 19774de..2ebdb2f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] envlist= py26-django{14,15,16}, - py27-django{14,15,16,17,18}, + py27-django{14,15,16,17,18,19}, py32-django{15,16,17,18}, py33-django{15,16,17,18}, - py34-django{15,16,17,18}, - py35-django18 + py34-django{15,16,17,18,19}, + py35-django{18,19} # py33-django-dev, docs, @@ -16,7 +16,7 @@ deps = django16: Django >= 1.6, < 1.7 django17: Django >= 1.7, < 1.8 django18: Django >= 1.8, < 1.9 - django19: Django >= 1.9a1, < 1.10 + django19: Django >= 1.9, < 1.10 django-dev: https://github.com/django/django/tarball/master commands= python runtests.py