diff --git a/.travis.yml b/.travis.yml index 12d5e71..9a51a85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python sudo: false python: - - 2.6 - 2.7 - 3.3 - 3.4 @@ -22,14 +21,6 @@ notifications: email: false matrix: exclude: - - python: 2.6 - env: DJANGO='django>=1.7,<1.8' - - python: 2.6 - env: DJANGO='django>=1.8,<1.9' - - python: 2.6 - env: DJANGO='django>=1.9,<1.10' - - python: 2.6 - env: DJANGO='django>=1.10,<1.11' - python: 3.3 env: DJANGO='django>=1.3,<1.4' - python: 3.3 diff --git a/docs/index.rst b/docs/index.rst index a7e6779..431c5e2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -31,13 +31,10 @@ sekizai will ignore any duplicate content in a single block. Dependencies ************ -* Python 2.6, 2.7, 3.3, 3.4 or 3.5. -* Django 1.3, 1.4, 1.5, 1.6, 1.7, 1.8 or 1.9. +* Python 2.7, 3.3, 3.4 or 3.5. +* Django 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 or 1.10. * django-classy-tags 0.3.1 or higher. -Python 2.6 requires ``backport_collections``. - - ***** Usage ***** @@ -50,9 +47,14 @@ steps: * Put 'sekizai' into your ``INSTALLED_APPS`` setting. * Use one of the following: - * Put ``sekizai.context_processors.sekizai`` into your + * For Django versions before 1.10, add + ``sekizai.context_processors.sekizai`` to your ``TEMPLATE_CONTEXT_PROCESSORS`` setting and use ``django.template.RequestContext`` when rendering your templates. + + For Django versions after 1.10, add ``sekizai.context_processors.sekizai`` + to your ``TEMPLATES['OPTIONS']['context_processors']`` setting and use + ``django.template.RequestContext`` when rendering your templates. or @@ -428,6 +430,12 @@ And here's the rendered template:: Changelog ********* +0.10.0 +====== + +* Added support for Django 1.10 +* Removed support for Python 2.6 + 0.9.0 ===== diff --git a/setup.py b/setup.py index 4928d11..2891107 100644 --- a/setup.py +++ b/setup.py @@ -1,15 +1,8 @@ -import sys - from setuptools import setup, find_packages version = __import__('sekizai').__version__ -if sys.hexversion < 0x02070000: - EXTRA_INSTALL_REQUIRES = ['backport_collections'] -else: - EXTRA_INSTALL_REQUIRES = [] - setup( name='django-sekizai', version=version, @@ -22,7 +15,7 @@ include_package_data=True, install_requires=[ 'django-classy-tags>=0.3.1', - ] + EXTRA_INSTALL_REQUIRES, + ], test_suite='runtests.main', classifiers=[ 'Development Status :: 5 - Production/Stable', @@ -32,7 +25,6 @@ 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4',