Add django 1.10

.travis.yml

@@ -5,22 +5,22 @@ language: python
 sudo: false
 
 python:
+  - 3.6
   - 3.5
   - 3.4
   - 3.3
   - 2.7
-  - 2.6
 
 env:
   matrix:
-  - DJANGO='django16-sekizai'
-  - DJANGO='django16-nosekizai'
-  - DJANGO='django17-sekizai'
-  - DJANGO='django17-nosekizai'
   - DJANGO='django18-sekizai'
   - DJANGO='django18-nosekizai'
   - DJANGO='django19-sekizai'
   - DJANGO='django19-nosekizai'
+  - DJANGO='django110-sekizai'
+  - DJANGO='django110-nosekizai'
+  - DJANGO='django111-sekizai'
+  - DJANGO='django111-nosekizai'
   - TOXENV='pep8'
   - TOXENV='isort'
   - TOXENV='docs'
@@ -29,11 +29,11 @@ env:
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
   - pip install -U tox>=1.8 coveralls
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PYVER=py36; fi"
   - "if [[ ${DJANGO}z != 'z' ]]; then export TOXENV=$PYVER-$DJANGO; fi"
 
 # command to run tests, e.g. python setup.py test
@@ -47,39 +47,19 @@ after_success:
 
 matrix:
   exclude:
-  - python: 2.6
-    env: DJANGO='django17-sekizai'
-  - python: 2.6
-    env: DJANGO='django17-nosekizai'
-  - python: 2.6
-    env: DJANGO='django18-sekizai'
-  - python: 2.6
-    env: DJANGO='django18-nosekizai'
-  - python: 2.6
-    env: DJANGO='django19-sekizai'
-  - python: 2.6
-    env: DJANGO='django19-nosekizai'
-
   - python: 3.3
     env: DJANGO='django19-sekizai'
   - python: 3.3
     env: DJANGO='django19-nosekizai'
+  - python: 3.3
+    env: DJANGO='django110-sekizai'
+  - python: 3.3
+    env: DJANGO='django110-nosekizai'
+  - python: 3.3
+    env: DJANGO='django111-sekizai'
+  - python: 3.3
+    env: DJANGO='django111-nosekizai'
 
-  - python: 3.5
-    env: DJANGO='django16-sekizai'
-  - python: 3.5
-    env: DJANGO='django16-nosekizai'
-  - python: 3.5
-    env: DJANGO='django17-sekizai'
-  - python: 3.5
-    env: DJANGO='django17-nosekizai'
-
-  - python: 2.6
-    env: TOXENV='pep8'
-  - python: 2.6
-    env: TOXENV='isort'
-  - python: 2.6
-    env: TOXENV='docs'
   - python: 2.7
     env: TOXENV='pep8'
   - python: 2.7
@@ -98,6 +78,12 @@ matrix:
     env: TOXENV='isort'
   - python: 3.4
     env: TOXENV='docs'
+  - python: 3.5
+    env: TOXENV='pep8'
+  - python: 3.5
+    env: TOXENV='isort'
+  - python: 3.5
+    env: TOXENV='docs'
 
 cache:
    directories:

HISTORY.rst

@@ -4,6 +4,10 @@
 History
 *******
 
+1.4.0 (unreleased)
+==================
+
+* Drop python 2.6/ Django<1.8
 
 1.3.2 (2016-10-26)
 ==================

README.rst

@@ -41,6 +41,8 @@ OpenGraph_, Twitter, and Google Plus properties to their HTML responses.
              django-meta 1.0 is a drop in replacement for django-meta-mixin:
              as a result django-meta-mixin is no longer actively developed
 
+.. warning:: As of version 1.4, the support for Python 2.6 and Django<1.8 has been dropped
+
 .. contents::
 
 Installation
@@ -54,13 +56,13 @@ Supported versions
 Django
 ------
 
-1.6 to 1.9 (newer versions might work but are not tested yet)
+1.8 to 1.11 (newer versions might work but are not tested yet)
 
 
 Python
 ------
 
-Python 2.6 to 3.5
+Python 2.7 to 3.6
 
 Basic concept
 =============

cms_helper.py

@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
+from tempfile import mkdtemp
+
 HELPER_SETTINGS = dict(
     ROOT_URLCONF='tests.example_app.urls',
     INSTALLED_APPS=[
@@ -13,6 +15,7 @@
     META_USE_OG_PROPERTIES=True,
     META_USE_TWITTER_PROPERTIES=True,
     META_USE_GOOGLEPLUS_PROPERTIES=True,
+    FILE_UPLOAD_TEMP_DIR=mkdtemp()
 )
 
 try:
@@ -36,5 +39,6 @@ def setup():
     from djangocms_helper import runner
     runner.setup('meta', sys.modules[__name__])
 
+
 if __name__ == '__main__':
     run()

meta/models.py

@@ -8,6 +8,7 @@
 
 from . import settings
 
+
 NEED_REQUEST_OBJECT_ERR_MSG = """
 Meta models needs request objects when initializing if sites framework is not used.
 """.strip()

meta/templatetags/meta.py

@@ -2,30 +2,20 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from django import template
-from django.conf import settings
+from django.apps import apps
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.six import string_types
 
 register = template.Library()
 
-try:
-    from django.apps import apps
-    # Use sekizai if installed, otherwise define a templatetag stub
-    if apps.is_installed('sekizai'):
-        from sekizai.templatetags.sekizai_tags import Addtoblock
-        register.tag('addtoblock', Addtoblock)
-    else:
-        from meta.compat import addtoblock
-        register.tag('addtoblock', addtoblock)
-
-except ImportError:
-    if 'sekizai' in settings.INSTALLED_APPS:
-        from sekizai.templatetags.sekizai_tags import Addtoblock
-        register.tag('addtoblock', Addtoblock)
-    else:
-        from meta.compat import addtoblock
-        register.tag('addtoblock', addtoblock)
+# Use sekizai if installed, otherwise define a templatetag stub
+if apps.is_installed('sekizai'):
+    from sekizai.templatetags.sekizai_tags import Addtoblock
+    register.tag('addtoblock', Addtoblock)
+else:
+    from meta.compat import addtoblock
+    register.tag('addtoblock', addtoblock)
 
 
 @register.simple_tag

meta/views.py

@@ -150,6 +150,7 @@ def __init__(self, **kwargs):
         self.use_sites = settings.USE_SITES
         self.use_og = settings.USE_OG_PROPERTIES
         self.use_title_tag = settings.USE_TITLE_TAG
+        super(MetadataMixin, self).__init__(**kwargs)
 
     def get_meta_class(self):
         return self.meta_class

setup.py

@@ -27,14 +27,15 @@
         'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )

tests/example_app/models.py

@@ -1,13 +1,16 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
+import os.path
+
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 
-from meta_mixin.models import ModelMeta
+from meta.models import ModelMeta
 
 
 class Post(ModelMeta, models.Model):

tests/example_app/urls.py

@@ -16,11 +16,9 @@
 urlpatterns = [
     url(r'^media/(?P<path>.*)$', django.views.static.serve,  # NOQA
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^admin/', include(admin.site.urls)),  # NOQA
     url(r'^jsi18n/(?P<packages>\S+?)/$', django.views.i18n.javascript_catalog),  # NOQA
     url(r'^mixin/(?P<slug>\w[-\w]*)/$', PostMixinDetailView.as_view(), name='post-detail-mixinx'),
     url(r'^(?P<slug>\w[-\w]*)/$', PostDetailView.as_view(), name='post-detail'),
     url(r'^$', PostListView.as_view(), name='post-list'),
 ]
-urlpatterns += i18n_patterns('',
-    url(r'^admin/', include(admin.site.urls)),  # NOQA
-)