From d7e37189641093038416f880cd5f9fc9c608eb32 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Mon, 8 Feb 2016 15:30:51 -0700 Subject: [PATCH] Add CI on Python 3.5, drop Python 3.2. --- .travis.yml | 14 ++++++-------- CHANGES.rst | 2 ++ tox.ini | 19 ++++++++++--------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index b23f12e..7b3317b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,18 +7,13 @@ env: - TOXENV=py26-django15 - TOXENV=py26-django16 - TOXENV=py27-django14 - - TOXENV=py27-django15 + - TOXENV=py27-django19 - TOXENV=py27-django15_nosouth + - TOXENV=py27-django15 - TOXENV=py27-django16 - TOXENV=py27-django17 - TOXENV=py27-django18 - - TOXENV=py27-django19 - TOXENV=py27-django_trunk - - TOXENV=py32-django15 - - TOXENV=py32-django16 - - TOXENV=py32-django17 - - TOXENV=py32-django18 - - TOXENV=py32-django_trunk - TOXENV=py33-django15 - TOXENV=py33-django16 - TOXENV=py33-django17 @@ -28,6 +23,9 @@ env: - TOXENV=py34-django18 - TOXENV=py34-django19 - TOXENV=py34-django_trunk + - TOXENV=py35-django18 + - TOXENV=py35-django19 + - TOXENV=py35-django_trunk install: - pip install --upgrade pip setuptools tox virtualenv coveralls @@ -38,8 +36,8 @@ script: matrix: allow_failures: - env: TOXENV=py27-django_trunk - - env: TOXENV=py32-django_trunk - env: TOXENV=py33-django_trunk - env: TOXENV=py34-django_trunk + - env: TOXENV=py35-django_trunk after_success: coveralls diff --git a/CHANGES.rst b/CHANGES.rst index 811ae54..90b649a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ CHANGES master (unreleased) ------------------- +* Drop support for Python 3.2. + 2.4 (2015-12-03) ---------------- diff --git a/tox.ini b/tox.ini index 40aa033..84018e9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] envlist = py26-django{14,15,16}, - py27-django14, py27-django15_nosouth, - py{27,32,33}-django{15,16,17,18,_trunk}, - py27-django19, + py27-django{14,19}, py27-django15_nosouth, + py{27,33}-django{15,16,17,18,_trunk}, py34-django{17,18,19,_trunk}, + py35-django{18,19,_trunk}, [testenv] basepython = @@ -13,15 +13,16 @@ basepython = py32: python3.2 py33: python3.3 py34: python3.4 + py35: python3.5 deps = coverage == 3.6 - django14: Django==1.4.18 - django15{,_nosouth}: Django==1.5.12 - django16: Django==1.6.10 - django17: Django==1.7.7 - django18: Django==1.8.5 - django19: Django==1.9 + django14: Django>=1.4,<1.5 + django15{,_nosouth}: 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 django_trunk: https://github.com/django/django/tarball/master django{14,15,16}: South==1.0.2