From 610e26ac4c6896dc83164e2ad9858003bd7c029a Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sat, 6 May 2017 13:02:36 +0200 Subject: [PATCH] Minor changes preparing release --- HISTORY.rst | 2 ++ meta/__init__.py | 2 +- setup.py | 3 +-- tox.ini | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 57825ea..b9d94be 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,8 +7,10 @@ History 1.4.0 (unreleased) ================== +* Add Django 1.11 support * Drop python 2.6/ Django<1.8 * Wrap meta.html content in spaceless templatetag to suppress redundant newlines +* Fix issue in Django 1.10 1.3.2 (2016-10-26) ================== diff --git a/meta/__init__.py b/meta/__init__.py index 9fffb2c..63ca4aa 100644 --- a/meta/__init__.py +++ b/meta/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -__version__ = '1.3.2.post1' +__version__ = '1.4.rc1' diff --git a/setup.py b/setup.py index 301f7ae..39dc55a 100644 --- a/setup.py +++ b/setup.py @@ -23,11 +23,10 @@ classifiers=[ 'Development Status :: 5 - Production/Stable', 'Framework :: Django', - 'Framework :: Django :: 1.6', - 'Framework :: Django :: 1.7', 'Framework :: Django :: 1.8', 'Framework :: Django :: 1.9', 'Framework :: Django :: 1.10', + 'Framework :: Django :: 1.11', 'Environment :: Web Environment', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', diff --git a/tox.ini b/tox.ini index e090104..95ec6b1 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ setenv: PYTHONPATH = {toxinidir}:{toxinidir}/meta:{toxinidir}/example commands = {env:COMMAND:python} cms_helper.py deps = - py26: unittest2 django18: django<1.9 django19: django<1.10 django110: django<1.11