From 43b1fa3c2de460eebc97685a10e53eb8cdf7967b Mon Sep 17 00:00:00 2001 From: Bertrand Bordage Date: Thu, 21 Jul 2016 10:20:07 +0200 Subject: [PATCH] Drops Python 3.2 and Django 1.7 support. --- .travis.yml | 92 ++++++++++------------------------------------------- tox.ini | 6 +--- 2 files changed, 17 insertions(+), 81 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97e38f6..7038479 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: python # We say we use Python 3.5 otherwise we only access by default -# to Python 2.7, 3.2, 3.3, & 3.4 +# to Python 2.7, 3.3, & 3.4 python: 3.5 @@ -13,21 +13,6 @@ addons: postgresql: 9.4 env: - - TOXENV=py2.7-django1.7-sqlite3-redis - - TOXENV=py2.7-django1.7-sqlite3-memcached - - TOXENV=py2.7-django1.7-sqlite3-pylibmc - - TOXENV=py2.7-django1.7-sqlite3-locmem - - TOXENV=py2.7-django1.7-sqlite3-filebased - - TOXENV=py2.7-django1.7-postgresql-redis - - TOXENV=py2.7-django1.7-postgresql-memcached - - TOXENV=py2.7-django1.7-postgresql-pylibmc - - TOXENV=py2.7-django1.7-postgresql-locmem - - TOXENV=py2.7-django1.7-postgresql-filebased - - TOXENV=py2.7-django1.7-mysql-redis - - TOXENV=py2.7-django1.7-mysql-memcached - - TOXENV=py2.7-django1.7-mysql-pylibmc - - TOXENV=py2.7-django1.7-mysql-locmem - - TOXENV=py2.7-django1.7-mysql-filebased - TOXENV=py2.7-django1.8-sqlite3-redis - TOXENV=py2.7-django1.8-sqlite3-memcached - TOXENV=py2.7-django1.8-sqlite3-pylibmc @@ -43,51 +28,6 @@ env: - TOXENV=py2.7-django1.8-mysql-pylibmc - TOXENV=py2.7-django1.8-mysql-locmem - TOXENV=py2.7-django1.8-mysql-filebased - - TOXENV=py3.2-django1.7-sqlite3-redis - - TOXENV=py3.2-django1.7-sqlite3-memcached - - TOXENV=py3.2-django1.7-sqlite3-pylibmc - - TOXENV=py3.2-django1.7-sqlite3-locmem - - TOXENV=py3.2-django1.7-sqlite3-filebased - - TOXENV=py3.2-django1.7-postgresql-redis - - TOXENV=py3.2-django1.7-postgresql-memcached - - TOXENV=py3.2-django1.7-postgresql-pylibmc - - TOXENV=py3.2-django1.7-postgresql-locmem - - TOXENV=py3.2-django1.7-postgresql-filebased - - TOXENV=py3.2-django1.7-mysql-redis - - TOXENV=py3.2-django1.7-mysql-memcached - - TOXENV=py3.2-django1.7-mysql-pylibmc - - TOXENV=py3.2-django1.7-mysql-locmem - - TOXENV=py3.2-django1.7-mysql-filebased - - TOXENV=py3.2-django1.8-sqlite3-redis - - TOXENV=py3.2-django1.8-sqlite3-memcached - - TOXENV=py3.2-django1.8-sqlite3-pylibmc - - TOXENV=py3.2-django1.8-sqlite3-locmem - - TOXENV=py3.2-django1.8-sqlite3-filebased - - TOXENV=py3.2-django1.8-postgresql-redis - - TOXENV=py3.2-django1.8-postgresql-memcached - - TOXENV=py3.2-django1.8-postgresql-pylibmc - - TOXENV=py3.2-django1.8-postgresql-locmem - - TOXENV=py3.2-django1.8-postgresql-filebased - - TOXENV=py3.2-django1.8-mysql-redis - - TOXENV=py3.2-django1.8-mysql-memcached - - TOXENV=py3.2-django1.8-mysql-pylibmc - - TOXENV=py3.2-django1.8-mysql-locmem - - TOXENV=py3.2-django1.8-mysql-filebased - - TOXENV=py3.3-django1.7-sqlite3-redis - - TOXENV=py3.3-django1.7-sqlite3-memcached - - TOXENV=py3.3-django1.7-sqlite3-pylibmc - - TOXENV=py3.3-django1.7-sqlite3-locmem - - TOXENV=py3.3-django1.7-sqlite3-filebased - - TOXENV=py3.3-django1.7-postgresql-redis - - TOXENV=py3.3-django1.7-postgresql-memcached - - TOXENV=py3.3-django1.7-postgresql-pylibmc - - TOXENV=py3.3-django1.7-postgresql-locmem - - TOXENV=py3.3-django1.7-postgresql-filebased - - TOXENV=py3.3-django1.7-mysql-redis - - TOXENV=py3.3-django1.7-mysql-memcached - - TOXENV=py3.3-django1.7-mysql-pylibmc - - TOXENV=py3.3-django1.7-mysql-locmem - - TOXENV=py3.3-django1.7-mysql-filebased - TOXENV=py3.3-django1.8-sqlite3-redis - TOXENV=py3.3-django1.8-sqlite3-memcached - TOXENV=py3.3-django1.8-sqlite3-pylibmc @@ -103,21 +43,6 @@ env: - TOXENV=py3.3-django1.8-mysql-pylibmc - TOXENV=py3.3-django1.8-mysql-locmem - TOXENV=py3.3-django1.8-mysql-filebased - - TOXENV=py3.4-django1.7-sqlite3-redis - - TOXENV=py3.4-django1.7-sqlite3-memcached - - TOXENV=py3.4-django1.7-sqlite3-pylibmc - - TOXENV=py3.4-django1.7-sqlite3-locmem - - TOXENV=py3.4-django1.7-sqlite3-filebased - - TOXENV=py3.4-django1.7-postgresql-redis - - TOXENV=py3.4-django1.7-postgresql-memcached - - TOXENV=py3.4-django1.7-postgresql-pylibmc - - TOXENV=py3.4-django1.7-postgresql-locmem - - TOXENV=py3.4-django1.7-postgresql-filebased - - TOXENV=py3.4-django1.7-mysql-redis - - TOXENV=py3.4-django1.7-mysql-memcached - - TOXENV=py3.4-django1.7-mysql-pylibmc - - TOXENV=py3.4-django1.7-mysql-locmem - - TOXENV=py3.4-django1.7-mysql-filebased - TOXENV=py3.4-django1.8-sqlite3-redis - TOXENV=py3.4-django1.8-sqlite3-memcached - TOXENV=py3.4-django1.8-sqlite3-pylibmc @@ -133,6 +58,21 @@ env: - TOXENV=py3.4-django1.8-mysql-pylibmc - TOXENV=py3.4-django1.8-mysql-locmem - TOXENV=py3.4-django1.8-mysql-filebased + - TOXENV=py3.5-django1.8-sqlite3-redis + - TOXENV=py3.5-django1.8-sqlite3-memcached + - TOXENV=py3.5-django1.8-sqlite3-pylibmc + - TOXENV=py3.5-django1.8-sqlite3-locmem + - TOXENV=py3.5-django1.8-sqlite3-filebased + - TOXENV=py3.5-django1.8-postgresql-redis + - TOXENV=py3.5-django1.8-postgresql-memcached + - TOXENV=py3.5-django1.8-postgresql-pylibmc + - TOXENV=py3.5-django1.8-postgresql-locmem + - TOXENV=py3.5-django1.8-postgresql-filebased + - TOXENV=py3.5-django1.8-mysql-redis + - TOXENV=py3.5-django1.8-mysql-memcached + - TOXENV=py3.5-django1.8-mysql-pylibmc + - TOXENV=py3.5-django1.8-mysql-locmem + - TOXENV=py3.5-django1.8-mysql-filebased - TOXENV=py2.7-django1.9-sqlite3-redis - TOXENV=py2.7-django1.9-sqlite3-memcached - TOXENV=py2.7-django1.9-sqlite3-pylibmc diff --git a/tox.ini b/tox.ini index a3a2737..973c0d4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,15 @@ [tox] envlist = - py{2.7,3.2,3.3,3.4}-django{1.7,1.8}-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py{2.7,3.3,3.4,3.5}-django1.8-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, py{2.7,3.4,3.5}-django1.9-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, [testenv] basepython = py2.7: python2.7 - py3.2: python3.2 py3.3: python3.3 py3.4: python3.4 py3.5: python3.5 deps = - django1.7: Django>=1.7,<1.8 django1.8: Django>=1.8,<1.9 django1.9: Django>=1.9,<1.10 psycopg2 @@ -21,8 +19,6 @@ deps = pytz py{2.7,3.3,3.4,3.5}: coverage py{2.7,3.3,3.4,3.5}: mysqlclient - py3.2: coverage<4.0 - py3.2: https://github.com/clelland/MySQL-for-Python-3/tarball/master setenv = sqlite3: DB_ENGINE=sqlite3 postgresql: DB_ENGINE=postgresql