From 83d48cc29ef29dce1ea69e7619bf4bb6ac2c3d98 Mon Sep 17 00:00:00 2001 From: Atsushi Odagiri Date: Mon, 2 May 2016 11:47:27 +0900 Subject: [PATCH] remove django1.2, django1.3 and python2.6 from test matrix --- .travis.yml | 8 +------- tox.ini | 57 +++-------------------------------------------------- 2 files changed, 4 insertions(+), 61 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7bac51..22b5863 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,9 @@ sudo: false python: 2.7 env: matrix: - - TOXENV=django13-py26 - - TOXENV=django12-py27 - - TOXENV=django13-py26 - - TOXENV=django13-py27 - - TOXENV=django14-py26 - TOXENV=django14-py27 - - TOXENV=django15-py26 + - TOXENV=django15-py27 - TOXENV=django16-py27 - - TOXENV=django16-py26 - TOXENV=django17-py27 install: diff --git a/tox.ini b/tox.ini index 5758a2d..5540968 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,8 @@ # content of: tox.ini , put in same dir as setup.py [tox] -envlist = django12-py26,django12-py27, - django13-py26,django13-py27, - django14-py26,django14-py27, - django15-py26,django15-py27, - django16-py26,django16-py27, +envlist = django14-py27, + django15-py27, + django16-py27, django17-py27 [testenv] @@ -17,9 +15,6 @@ deps = kombu==1.1.6 django-celery==2.2.4 -[py26] -basepython=python2.6 - [py27] basepython=python2.7 @@ -55,42 +50,8 @@ deps= Django>=1.7,<1.8 django-jsonfield==0.9.13 -# Django 1.2 - -[testenv:django12-py26] -basepython={[py26]basepython} -deps= - {[django12]deps} - {[base]deps} - -[testenv:django12-py27] -basepython={[py27]basepython} -deps= - {[django12]deps} - {[base]deps} - -# Django 1.3 - -[testenv:django13-py26] -basepython={[py26]basepython} -deps= - {[django13]deps} - {[base]deps} - -[testenv:django13-py27] -basepython={[py27]basepython} -deps= - {[django13]deps} - {[base]deps} - # Django 1.4 -[testenv:django14-py26] -basepython={[py26]basepython} -deps= - {[django14]deps} - {[base]deps} - [testenv:django14-py27] basepython={[py27]basepython} deps= @@ -99,12 +60,6 @@ deps= # Django 1.5 -[testenv:django15-py26] -basepython={[py26]basepython} -deps= - {[django15]deps} - {[base]deps} - [testenv:django15-py27] basepython={[py27]basepython} deps= @@ -113,12 +68,6 @@ deps= # Django 1.6 -[testenv:django16-py26] -basepython={[py26]basepython} -deps= - {[django16]deps} - {[base]deps} - [testenv:django16-py27] basepython={[py27]basepython} deps=