Merge pull request #58 from nephila/feature/prepare_1_4

Minor changes preparing release
nephila · May 6, 2017 · 21e740f · 21e740f
2 parents 0554e1a + 610e26a
commit 21e740f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.3.2.post1'
+__version__ = '1.4.rc1'
diff --git 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
@@ -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