From d7a36def44a951b81bf2b6e62f4915e57be2a038 Mon Sep 17 00:00:00 2001 From: Bertrand Bordage Date: Fri, 2 Jun 2017 22:59:35 +0200 Subject: [PATCH] Also drops Django 1.9 & Python 3.3. --- .travis.yml | 157 ++++++++++++++++++++++++++------------------ docs/quickstart.rst | 4 +- setup.py | 4 +- tox.ini | 7 +- 4 files changed, 101 insertions(+), 71 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4079483..a3a60ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: python -# We say we use Python 3.5 otherwise we only access by default -# to Python 2.7, 3.3, & 3.4 +# We say we use Python 3.6 otherwise we only access by default +# to Python 2.7, 3.4, & 3.5 -python: 3.5 +python: 3.6 services: - memcached @@ -15,21 +15,6 @@ addons: cache: pip env: - - TOXENV=py3.3-django1.8-sqlite3-redis - - TOXENV=py3.3-django1.8-sqlite3-memcached - - TOXENV=py3.3-django1.8-sqlite3-pylibmc - - TOXENV=py3.3-django1.8-sqlite3-locmem - - TOXENV=py3.3-django1.8-sqlite3-filebased - - TOXENV=py3.3-django1.8-postgresql-redis - - TOXENV=py3.3-django1.8-postgresql-memcached - - TOXENV=py3.3-django1.8-postgresql-pylibmc - - TOXENV=py3.3-django1.8-postgresql-locmem - - TOXENV=py3.3-django1.8-postgresql-filebased - - TOXENV=py3.3-django1.8-mysql-redis - - TOXENV=py3.3-django1.8-mysql-memcached - - TOXENV=py3.3-django1.8-mysql-pylibmc - - TOXENV=py3.3-django1.8-mysql-locmem - - TOXENV=py3.3-django1.8-mysql-filebased - TOXENV=py2.7-django1.8-sqlite3-redis - TOXENV=py2.7-django1.8-sqlite3-memcached - TOXENV=py2.7-django1.8-sqlite3-pylibmc @@ -45,21 +30,6 @@ env: - TOXENV=py2.7-django1.8-mysql-pylibmc - TOXENV=py2.7-django1.8-mysql-locmem - TOXENV=py2.7-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 - - TOXENV=py2.7-django1.9-sqlite3-locmem - - TOXENV=py2.7-django1.9-sqlite3-filebased - - TOXENV=py2.7-django1.9-postgresql-redis - - TOXENV=py2.7-django1.9-postgresql-memcached - - TOXENV=py2.7-django1.9-postgresql-pylibmc - - TOXENV=py2.7-django1.9-postgresql-locmem - - TOXENV=py2.7-django1.9-postgresql-filebased - - TOXENV=py2.7-django1.9-mysql-redis - - TOXENV=py2.7-django1.9-mysql-memcached - - TOXENV=py2.7-django1.9-mysql-pylibmc - - TOXENV=py2.7-django1.9-mysql-locmem - - TOXENV=py2.7-django1.9-mysql-filebased - TOXENV=py2.7-django1.10-sqlite3-redis - TOXENV=py2.7-django1.10-sqlite3-memcached - TOXENV=py2.7-django1.10-sqlite3-pylibmc @@ -75,6 +45,21 @@ env: - TOXENV=py2.7-django1.10-mysql-pylibmc - TOXENV=py2.7-django1.10-mysql-locmem - TOXENV=py2.7-django1.10-mysql-filebased + - TOXENV=py2.7-django1.11-sqlite3-redis + - TOXENV=py2.7-django1.11-sqlite3-memcached + - TOXENV=py2.7-django1.11-sqlite3-pylibmc + - TOXENV=py2.7-django1.11-sqlite3-locmem + - TOXENV=py2.7-django1.11-sqlite3-filebased + - TOXENV=py2.7-django1.11-postgresql-redis + - TOXENV=py2.7-django1.11-postgresql-memcached + - TOXENV=py2.7-django1.11-postgresql-pylibmc + - TOXENV=py2.7-django1.11-postgresql-locmem + - TOXENV=py2.7-django1.11-postgresql-filebased + - TOXENV=py2.7-django1.11-mysql-redis + - TOXENV=py2.7-django1.11-mysql-memcached + - TOXENV=py2.7-django1.11-mysql-pylibmc + - TOXENV=py2.7-django1.11-mysql-locmem + - TOXENV=py2.7-django1.11-mysql-filebased - TOXENV=py3.4-django1.8-sqlite3-redis - TOXENV=py3.4-django1.8-sqlite3-memcached - TOXENV=py3.4-django1.8-sqlite3-pylibmc @@ -90,21 +75,6 @@ env: - TOXENV=py3.4-django1.8-mysql-pylibmc - TOXENV=py3.4-django1.8-mysql-locmem - TOXENV=py3.4-django1.8-mysql-filebased - - TOXENV=py3.4-django1.9-sqlite3-redis - - TOXENV=py3.4-django1.9-sqlite3-memcached - - TOXENV=py3.4-django1.9-sqlite3-pylibmc - - TOXENV=py3.4-django1.9-sqlite3-locmem - - TOXENV=py3.4-django1.9-sqlite3-filebased - - TOXENV=py3.4-django1.9-postgresql-redis - - TOXENV=py3.4-django1.9-postgresql-memcached - - TOXENV=py3.4-django1.9-postgresql-pylibmc - - TOXENV=py3.4-django1.9-postgresql-locmem - - TOXENV=py3.4-django1.9-postgresql-filebased - - TOXENV=py3.4-django1.9-mysql-redis - - TOXENV=py3.4-django1.9-mysql-memcached - - TOXENV=py3.4-django1.9-mysql-pylibmc - - TOXENV=py3.4-django1.9-mysql-locmem - - TOXENV=py3.4-django1.9-mysql-filebased - TOXENV=py3.4-django1.10-sqlite3-redis - TOXENV=py3.4-django1.10-sqlite3-memcached - TOXENV=py3.4-django1.10-sqlite3-pylibmc @@ -120,6 +90,21 @@ env: - TOXENV=py3.4-django1.10-mysql-pylibmc - TOXENV=py3.4-django1.10-mysql-locmem - TOXENV=py3.4-django1.10-mysql-filebased + - TOXENV=py3.4-django1.11-sqlite3-redis + - TOXENV=py3.4-django1.11-sqlite3-memcached + - TOXENV=py3.4-django1.11-sqlite3-pylibmc + - TOXENV=py3.4-django1.11-sqlite3-locmem + - TOXENV=py3.4-django1.11-sqlite3-filebased + - TOXENV=py3.4-django1.11-postgresql-redis + - TOXENV=py3.4-django1.11-postgresql-memcached + - TOXENV=py3.4-django1.11-postgresql-pylibmc + - TOXENV=py3.4-django1.11-postgresql-locmem + - TOXENV=py3.4-django1.11-postgresql-filebased + - TOXENV=py3.4-django1.11-mysql-redis + - TOXENV=py3.4-django1.11-mysql-memcached + - TOXENV=py3.4-django1.11-mysql-pylibmc + - TOXENV=py3.4-django1.11-mysql-locmem + - TOXENV=py3.4-django1.11-mysql-filebased - TOXENV=py3.5-django1.8-sqlite3-redis - TOXENV=py3.5-django1.8-sqlite3-memcached - TOXENV=py3.5-django1.8-sqlite3-pylibmc @@ -135,21 +120,6 @@ env: - TOXENV=py3.5-django1.8-mysql-pylibmc - TOXENV=py3.5-django1.8-mysql-locmem - TOXENV=py3.5-django1.8-mysql-filebased - - TOXENV=py3.5-django1.9-sqlite3-redis - - TOXENV=py3.5-django1.9-sqlite3-memcached - - TOXENV=py3.5-django1.9-sqlite3-pylibmc - - TOXENV=py3.5-django1.9-sqlite3-locmem - - TOXENV=py3.5-django1.9-sqlite3-filebased - - TOXENV=py3.5-django1.9-postgresql-redis - - TOXENV=py3.5-django1.9-postgresql-memcached - - TOXENV=py3.5-django1.9-postgresql-pylibmc - - TOXENV=py3.5-django1.9-postgresql-locmem - - TOXENV=py3.5-django1.9-postgresql-filebased - - TOXENV=py3.5-django1.9-mysql-redis - - TOXENV=py3.5-django1.9-mysql-memcached - - TOXENV=py3.5-django1.9-mysql-pylibmc - - TOXENV=py3.5-django1.9-mysql-locmem - - TOXENV=py3.5-django1.9-mysql-filebased - TOXENV=py3.5-django1.10-sqlite3-redis - TOXENV=py3.5-django1.10-sqlite3-memcached - TOXENV=py3.5-django1.10-sqlite3-pylibmc @@ -165,6 +135,67 @@ env: - TOXENV=py3.5-django1.10-mysql-pylibmc - TOXENV=py3.5-django1.10-mysql-locmem - TOXENV=py3.5-django1.10-mysql-filebased + - TOXENV=py3.5-django1.11-sqlite3-redis + - TOXENV=py3.5-django1.11-sqlite3-memcached + - TOXENV=py3.5-django1.11-sqlite3-pylibmc + - TOXENV=py3.5-django1.11-sqlite3-locmem + - TOXENV=py3.5-django1.11-sqlite3-filebased + - TOXENV=py3.5-django1.11-postgresql-redis + - TOXENV=py3.5-django1.11-postgresql-memcached + - TOXENV=py3.5-django1.11-postgresql-pylibmc + - TOXENV=py3.5-django1.11-postgresql-locmem + - TOXENV=py3.5-django1.11-postgresql-filebased + - TOXENV=py3.5-django1.11-mysql-redis + - TOXENV=py3.5-django1.11-mysql-memcached + - TOXENV=py3.5-django1.11-mysql-pylibmc + - TOXENV=py3.5-django1.11-mysql-locmem + - TOXENV=py3.5-django1.11-mysql-filebased + - TOXENV=py3.6-django1.8-sqlite3-redis + - TOXENV=py3.6-django1.8-sqlite3-memcached + - TOXENV=py3.6-django1.8-sqlite3-pylibmc + - TOXENV=py3.6-django1.8-sqlite3-locmem + - TOXENV=py3.6-django1.8-sqlite3-filebased + - TOXENV=py3.6-django1.8-postgresql-redis + - TOXENV=py3.6-django1.8-postgresql-memcached + - TOXENV=py3.6-django1.8-postgresql-pylibmc + - TOXENV=py3.6-django1.8-postgresql-locmem + - TOXENV=py3.6-django1.8-postgresql-filebased + - TOXENV=py3.6-django1.8-mysql-redis + - TOXENV=py3.6-django1.8-mysql-memcached + - TOXENV=py3.6-django1.8-mysql-pylibmc + - TOXENV=py3.6-django1.8-mysql-locmem + - TOXENV=py3.6-django1.8-mysql-filebased + - TOXENV=py3.6-django1.10-sqlite3-redis + - TOXENV=py3.6-django1.10-sqlite3-memcached + - TOXENV=py3.6-django1.10-sqlite3-pylibmc + - TOXENV=py3.6-django1.10-sqlite3-locmem + - TOXENV=py3.6-django1.10-sqlite3-filebased + - TOXENV=py3.6-django1.10-postgresql-redis + - TOXENV=py3.6-django1.10-postgresql-memcached + - TOXENV=py3.6-django1.10-postgresql-pylibmc + - TOXENV=py3.6-django1.10-postgresql-locmem + - TOXENV=py3.6-django1.10-postgresql-filebased + - TOXENV=py3.6-django1.10-mysql-redis + - TOXENV=py3.6-django1.10-mysql-memcached + - TOXENV=py3.6-django1.10-mysql-pylibmc + - TOXENV=py3.6-django1.10-mysql-locmem + - TOXENV=py3.6-django1.10-mysql-filebased + - TOXENV=py3.6-django1.11-sqlite3-redis + - TOXENV=py3.6-django1.11-sqlite3-memcached + - TOXENV=py3.6-django1.11-sqlite3-pylibmc + - TOXENV=py3.6-django1.11-sqlite3-locmem + - TOXENV=py3.6-django1.11-sqlite3-filebased + - TOXENV=py3.6-django1.11-postgresql-redis + - TOXENV=py3.6-django1.11-postgresql-memcached + - TOXENV=py3.6-django1.11-postgresql-pylibmc + - TOXENV=py3.6-django1.11-postgresql-locmem + - TOXENV=py3.6-django1.11-postgresql-filebased + - TOXENV=py3.6-django1.11-mysql-redis + - TOXENV=py3.6-django1.11-mysql-memcached + - TOXENV=py3.6-django1.11-mysql-pylibmc + - TOXENV=py3.6-django1.11-mysql-locmem + - TOXENV=py3.6-django1.11-mysql-filebased + sudo: false diff --git a/docs/quickstart.rst b/docs/quickstart.rst index f8de3e8..9e8669e 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -4,8 +4,8 @@ Quick start Requirements ............ -- Django 1.8, 1.9 or 1.10 -- Python 2.7, 3.3, 3.4, or 3.5 +- Django 1.8, 1.10 or 1.11 +- Python 2.7, 3.4, 3.5 or 3.6 - a cache configured as ``'default'`` with one of these backends: - `django-redis `_ diff --git a/setup.py b/setup.py index 6952da1..0dc6e70 100755 --- a/setup.py +++ b/setup.py @@ -27,14 +27,14 @@ setup( 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Framework :: Django :: 1.8', - 'Framework :: Django :: 1.9', 'Framework :: Django :: 1.10', + 'Framework :: Django :: 1.11', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Topic :: Internet :: WWW/HTTP', ], license='BSD', diff --git a/tox.ini b/tox.ini index 3e1c1a8..f6baa27 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,17 @@ [tox] envlist = - py3.3-django1.8-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, - py{2.7,3.4,3.5}-django{1.8,1.9,1.10}-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py{2.7,3.4,3.5,3.6}-django{1.8,1.10,1.11}-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, [testenv] basepython = py2.7: python2.7 - py3.3: python3.3 py3.4: python3.4 py3.5: python3.5 + py3.6: python3.6 deps = django1.8: Django>=1.8,<1.9 - django1.9: Django>=1.9,<1.10 django1.10: Django>=1.10,<1.11 + django1.11: Django>=1.11,<1.12 psycopg2 mysqlclient django-redis