Add support for Django 1.10. Drop older versions.

Author: yakky

.travis.yml

@@ -7,35 +7,25 @@ sudo: false
 python:
   - 3.5
   - 3.4
-  - 3.3
   - 2.7
-  - 2.6
 
 env:
   matrix:
   - TOXENV='pep8'
   - TOXENV='docs'
   - TOXENV='isort'
-  - DJANGO='django16' CMS='cms30'
-  - DJANGO='django16' CMS='cms31'
-  - DJANGO='django16' CMS='cms32'
-  - DJANGO='django17' CMS='cms30'
-  - DJANGO='django17' CMS='cms31'
-  - DJANGO='django17' CMS='cms32'
-  - DJANGO='django18' CMS='cms31'
   - DJANGO='django18' CMS='cms32'
   - DJANGO='django18' CMS='cms33'
   - DJANGO='django18' CMS='cms34'
   - DJANGO='django19' CMS='cms32'
   - DJANGO='django19' CMS='cms33'
   - DJANGO='django19' CMS='cms34'
+  - DJANGO='django110' CMS='cms34'
 
 # 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 [[ ${DJANGO}z != 'z' ]]; then export TOXENV=$PYVER-$DJANGO-$CMS; fi"
@@ -51,65 +41,15 @@ after_success:
 
 matrix:
   exclude:
-  - 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
     env: TOXENV='isort'
   - python: 2.7
     env: TOXENV='docs'
-  - python: 3.3
-    env: TOXENV='pep8'
-  - python: 3.3
-    env: TOXENV='isort'
-  - python: 3.3
-    env: TOXENV='docs'
   - python: 3.4
     env: TOXENV='pep8'
   - python: 3.4
     env: TOXENV='isort'
   - python: 3.4
     env: TOXENV='docs'
-  - python: 2.6
-    env: DJANGO='django17' CMS='cms30'
-  - python: 2.6
-    env: DJANGO='django17' CMS='cms31'
-  - python: 2.6
-    env: DJANGO='django17' CMS='cms32'
-  - python: 2.6
-    env: DJANGO='django18' CMS='cms31'
-  - python: 2.6
-    env: DJANGO='django18' CMS='cms32'
-  - python: 2.6
-    env: DJANGO='django18' CMS='cms33'
-  - python: 2.6
-    env: DJANGO='django18' CMS='cms34'
-  - python: 2.6
-    env: DJANGO='django19' CMS='cms32'
-  - python: 2.6
-    env: DJANGO='django19' CMS='cms33'
-  - python: 2.6
-    env: DJANGO='django19' CMS='cms34'
-  - python: 3.3
-    env: DJANGO='django19' CMS='cms32'
-  - python: 3.3
-    env: DJANGO='django19' CMS='cms33'
-  - python: 3.3
-    env: DJANGO='django19' CMS='cms34'
-  - python: 3.5
-    env: DJANGO='django16' CMS='cms30'
-  - python: 3.5
-    env: DJANGO='django16' CMS='cms31'
-  - python: 3.5
-    env: DJANGO='django16' CMS='cms32'
-  - python: 3.5
-    env: DJANGO='django17' CMS='cms30'
-  - python: 3.5
-    env: DJANGO='django17' CMS='cms31'
-  - python: 3.5
-    env: DJANGO='django17' CMS='cms32'

HISTORY.rst

@@ -4,6 +4,13 @@
 History
 *******
 
+0.7.0 (unreleased)
+==================
+
+* Drop Django 1.7 and below
+* Drop django CMS 3.1 and below
+* Add Django 1.10 support
+
 0.6.3 (2016-10-22)
 ==================
 

README.rst

@@ -32,27 +32,14 @@ djangocms-page-meta
 
 Meta tag information for django CMS 3 pages
 
-Support Python version:
+Python: 2.7, 3.4, 3.5
 
-* Python 2.6
-* Python 2.7
-* Python 3.3
-* Python 3.4
-* Python 3.5
+Django: 1.8 to 1.10
 
-Supported Django versions:
+django CMS: 3.2 to 3.4
 
-* Django 1.6
-* Django 1.7
-* Django 1.8
-* Django 1.9
-
-Supported django CMS versions:
-
-* django CMS 3.x
-
-.. warning:: Version 0.6 will be the last one supporting Python 2.6, Python 3.3,
-             Django<1.8 and django CMS<3.2.
+.. warning:: Since version 0.7, the support for Python 2.6, Python 3.3, Django<1.8 and django CMS<3.2
+             has been dropped
 
 
 **********
@@ -91,8 +78,8 @@ Quickstart
 Dependencies
 ============
 
-* `django-filer`_ >= 0.9.5
-* `django-meta`_  >= 1.0
+* `django-filer`_ >= 1.2
+* `django-meta`_  >= 1.3
 
 .. _django-filer: https://pypi.python.org/pypi/django-filer
 .. _django-meta: https://pypi.python.org/pypi/django-meta

djangocms_page_meta/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
-__version__ = '0.6.3.post1'
+__version__ = '0.7.0.dev1'
 __author__ = 'Iacopo Spalletti <[email protected]>'
 
 default_app_config = 'djangocms_page_meta.apps.PageMetaConfig'

djangocms_page_meta/cms_toolbar.py

@@ -2,6 +2,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from cms.api import get_page_draft
+from cms.cms_toolbars import PAGE_MENU_SECOND_BREAK
 from cms.toolbar.items import Break
 from cms.toolbar_base import CMSToolbar
 from cms.toolbar_pool import toolbar_pool
@@ -18,10 +19,6 @@
 except ImportError:
     from cms.utils.permissions import has_page_change_permission
 
-try:
-    from cms.cms_toolbars import PAGE_MENU_SECOND_BREAK
-except ImportError:
-    from cms.cms_toolbar import PAGE_MENU_SECOND_BREAK
 
 PAGE_META_MENU_TITLE = _('Meta-information')
 PAGE_META_ITEM_TITLE = _('Common')

djangocms_page_meta/cms_toolbars.py

@@ -1,29 +1,17 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
-import django
+from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language_from_request
 from meta import settings as meta_settings
 
-if django.get_version() >= '1.8':
-    from django.template.loader import render_to_string
-else:
-    from django.template import loader, RequestContext
-
-    def render_to_string(template_name, context=None, request=None):
-        context_instance = RequestContext(request) if request else None
-        return loader.render_to_string(template_name, context, context_instance)
-
 
 def get_cache_key(page, language):
     """
     Create the cache key for the current page and language
     """
-    try:
-        from cms.cache import _get_cache_key
-    except ImportError:
-        from cms.templatetags.cms_tags import _get_cache_key
+    from cms.cache import _get_cache_key
     site_id = page.site_id
     return _get_cache_key('page_meta', page, language, site_id)
 

djangocms_page_meta/utils.py

@@ -1,2 +1 @@
 -e .
-wheel

requirements.txt

@@ -1,5 +1,6 @@
 [flake8]
-exclude = *.egg-info,.git,.settings,.tox,build,dist,docs,requirements,tmp,*migrations*,*south_migrations*,tests,data
+exclude = *.egg-info,*.eggs,.git,.settings,.tox,build,dist,docs,requirements,tmp,*migrations*,*south_migrations*,tests,data
+ignore = E305
 max-line-length = 99
 
 [metadata]
@@ -16,4 +17,4 @@ default_section = THIRDPARTY
 include_trailing_comma = true
 known_first_party = djangocms_page_meta
 multi_line_output = 5
-not_skip = __init__.py
+not_skip = __init__.py

setup.cfg

@@ -36,9 +36,9 @@
     ],
     include_package_data=True,
     install_requires=(
-        'django-cms>=3.0',
-        'django-meta>=1.3b1',
-        'django-filer>=0.9.5',
+        'django-cms>=3.2',
+        'django-meta>=1.3',
+        'django-filer>=1.2',
     ),
     license='BSD',
     zip_safe=False,
@@ -51,15 +51,12 @@
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         'Framework :: Django',
-        'Framework :: Django :: 1.6',
-        'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
     ],

setup.py

@@ -8,7 +8,7 @@
 from django.test.utils import override_settings
 from django.utils.encoding import force_text
 
-from djangocms_page_meta.cms_toolbar import PAGE_META_ITEM_TITLE, PAGE_META_MENU_TITLE
+from djangocms_page_meta.cms_toolbars import PAGE_META_ITEM_TITLE, PAGE_META_MENU_TITLE
 from djangocms_page_meta.models import PageMeta, TitleMeta
 
 from . import BaseTest

tests/test_toolbar.py

@@ -3,26 +3,26 @@
 
 from cms.utils.conf import get_cms_setting
 from django.conf import settings
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views.i18n import javascript_catalog
+from django.views.static import serve
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
+    url(r'^media/(?P<path>.*)$', serve,
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-    url(r'^media/cms/(?P<path>.*)$', 'django.views.static.serve',
+    url(r'^media/cms/(?P<path>.*)$', serve,
         {'document_root': get_cms_setting('MEDIA_ROOT'), 'show_indexes': True}),
-    url(r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
-)
+    url(r'^jsi18n/(?P<packages>\S+?)/$', javascript_catalog),
+]
 
 urlpatterns += staticfiles_urlpatterns()
 
 urlpatterns += i18n_patterns(
-    '',
     url(r'^', include('cms.urls')),
 )

tests/test_utils/urls.py

@@ -1,19 +1,9 @@
 [tox]
-envlist = docs,pep8,isort,py{35,34,27}-django{19}-cms{34,33,32},py{35,34,33,27}-django{18}-cms{34,33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30}
+envlist = docs,pep8,isort,py{35,34,27}-django{110}-cms{34},py{35,34,27}-django{19}-cms{34,33,32},py{35,34,27}-django{18}-cms{34,33,32}
 
 [testenv]
 commands = {env:COMMAND:python} setup.py test
 deps =
-    django16: Django>=1.6,<1.7
-    django16: https://github.com/divio/django-formtools/archive/master.zip
-    django16: django-polymorphic<0.8
-    django16: django-treebeard<4.0
-    django16: django-mptt<0.8
-    django16: django-taggit<0.18
-    django17: Django>=1.7,<1.8
-    django17: django-mptt<0.8
-    django17: django-taggit<0.18
-    django17: django-polymorphic<0.9
     django18: Django>=1.8,<1.9
     django18: django-mptt>=0.8
     django18: django-taggit>=0.18
@@ -22,17 +12,14 @@ deps =
     django19: django-mptt>=0.8
     django19: django-taggit>=0.18
     django19: django-polymorphic<0.9
-    cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip
-    cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip
+    django110: Django>=1.10,<1.11
+    django110: django-mptt>=0.8
+    django110: django-taggit>=0.18
+    django110: django-polymorphic>=0.9
+    django110: https://github.com/divio/django-filer/archive/develop.zip
     cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip
     cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip
-    cms34: https://github.com/divio/django-cms/archive/develop.zip
-    py26: unittest2
-    py26: django-filer<1.2
-    py27: django-filer>=1.2
-    py33: django-filer>=1.2
-    py34: django-filer>=1.2
-    py35: django-filer>=1.2
+    cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip
     -r{toxinidir}/requirements-test.txt
 
 [testenv:pep8]