From 878addd7373f7b112f3d138bff31d02266972eee Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 28 Jan 2015 09:43:50 +0000 Subject: [PATCH] Removed Python 3.2 from travis/tox --- .travis.yml | 4 +--- tox.ini | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae33a3661..3bb00d546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,11 @@ matrix: include: - env: TOXENV=py27-dj17-postgres - env: TOXENV=py27-dj17-sqlite - - env: TOXENV=py32-dj17-postgres -# - env: TOXENV=py33-dj17-postgres + - env: TOXENV=py33-dj17-postgres - env: TOXENV=py34-dj17-postgres - env: TOXENV=py34-dj17-sqlite - env: TOXENV=py27-dj18-postgres # - env: TOXENV=py27-dj18-sqlite -# - env: TOXENV=py32-dj18-postgres # - env: TOXENV=py33-dj18-postgres - env: TOXENV=py34-dj18-postgres - env: TOXENV=py34-dj18-sqlite diff --git a/tox.ini b/tox.ini index 503007c5e..71b18622f 100644 --- a/tox.ini +++ b/tox.ini @@ -42,16 +42,12 @@ usedevelop = True envlist = py27-dj17-postgres, py27-dj17-sqlite, - py32-dj17-postgres, - py32-dj17-sqlite, py33-dj17-postgres, py33-dj17-sqlite, py34-dj17-postgres, py34-dj17-sqlite, py27-dj18-postgres, py27-dj18-sqlite, - py32-dj18-postgres, - py32-dj18-sqlite, py33-dj18-postgres, py33-dj18-sqlite, py34-dj18-postgres, @@ -99,25 +95,6 @@ setenv = DATABASE_ENGINE=django.db.backends.mysql DATABASE_USER=wagtail -[testenv:py32-dj17-postgres] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj17} - psycopg2==2.5.3 -setenv = - DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 - -[testenv:py32-dj17-sqlite] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj171} -setenv = - DATABASE_ENGINE=django.db.backends.sqlite3 - [testenv:py33-dj17-postgres] basepython=python3.3 deps = @@ -187,25 +164,6 @@ setenv = DATABASE_ENGINE=django.db.backends.mysql DATABASE_USER=wagtail -[testenv:py32-dj18-postgres] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj18} - psycopg2==2.5.3 -setenv = - DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 - -[testenv:py32-dj18-sqlite] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj18} -setenv = - DATABASE_ENGINE=django.db.backends.sqlite3 - [testenv:py33-dj18-postgres] basepython=python3.3 deps =