diff --git a/.travis.yml b/.travis.yml index 43a201d..670f454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,10 @@ -# Config file for automatic testing at travis-ci.org - language: python - -sudo: false +dist: xenial python: + - 3.7 - 3.6 - 3.5 - - 3.4 - 2.7 env: @@ -15,25 +12,21 @@ env: - TOXENV='pep8' - TOXENV='docs' - TOXENV='isort' + - DJANGO='django22' CMS='cms37' - DJANGO='django21' CMS='cms36' - - DJANGO='django20' CMS='cms36' + - DJANGO='django22' CMS='cms36' + - DJANGO='django111' CMS='cms37' - DJANGO='django111' CMS='cms36' - DJANGO='django111' CMS='cms35' - - DJANGO='django110' CMS='cms35' - - DJANGO='django19' CMS='cms35' - - DJANGO='django18' CMS='cms35' - DJANGO='django111' CMS='cms34' - - DJANGO='django110' CMS='cms34' - - DJANGO='django19' CMS='cms34' - - DJANGO='django18' CMS='cms34' # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - pip install -U setuptools tox>=1.8 coveralls - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; 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 [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PYVER=py37; fi" - "if [[ ${DJANGO}z != 'z' ]]; then export TOXENV=$PYVER-$DJANGO-$CMS; fi" # command to run tests, e.g. python setup.py test @@ -53,55 +46,37 @@ matrix: env: TOXENV='isort' - python: 2.7 env: TOXENV='docs' - - python: 3.4 - env: TOXENV='pep8' - - python: 3.4 - env: TOXENV='isort' - - python: 3.4 - env: TOXENV='docs' - - python: 2.7 - env: DJANGO='django20' CMS='cms36' - python: 2.7 env: DJANGO='django21' CMS='cms36' - - python: 3.4 - env: DJANGO='django18' CMS='cms34' - - python: 3.4 - env: DJANGO='django19' CMS='cms34' - - python: 3.4 - env: DJANGO='django110' CMS='cms34' - - python: 3.4 - env: DJANGO='django18' CMS='cms35' - - python: 3.4 - env: DJANGO='django19' CMS='cms35' - - python: 3.4 - env: DJANGO='django110' CMS='cms35' - - python: 3.4 - env: DJANGO='django111' CMS='cms36' - - python: 3.4 - env: DJANGO='django20' CMS='cms36' - - python: 3.4 - env: DJANGO='django21' CMS='cms36' - - python: 3.5 - env: DJANGO='django18' CMS='cms34' - - python: 3.5 - env: DJANGO='django19' CMS='cms34' - - python: 3.5 - env: DJANGO='django110' CMS='cms34' + - python: 2.7 + env: DJANGO='django22' CMS='cms36' + - python: 2.7 + env: DJANGO='django21' CMS='cms37' + - python: 2.7 + env: DJANGO='django22' CMS='cms37' - python: 3.5 - env: DJANGO='django18' CMS='cms35' + env: DJANGO='django111' CMS='cms36' - python: 3.5 - env: DJANGO='django19' CMS='cms35' + env: DJANGO='django21' CMS='cms36' - python: 3.5 - env: DJANGO='django110' CMS='cms35' + env: DJANGO='django22' CMS='cms36' - python: 3.5 - env: DJANGO='django111' CMS='cms36' + env: DJANGO='django111' CMS='cms37' - python: 3.5 - env: DJANGO='django20' CMS='cms36' + env: DJANGO='django21' CMS='cms37' - python: 3.5 - env: DJANGO='django21' CMS='cms36' + env: DJANGO='django22' CMS='cms37' - python: 3.5 env: TOXENV='pep8' - python: 3.5 env: TOXENV='isort' - python: 3.5 env: TOXENV='docs' + - python: 3.6 + env: DJANGO='django22' CMS='cms36' + - python: 3.6 + env: TOXENV='pep8' + - python: 3.6 + env: TOXENV='isort' + - python: 3.6 + env: TOXENV='docs' diff --git a/HISTORY.rst b/HISTORY.rst index 3dfe023..fcafc16 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,12 @@ History ******* +0.9.0 (unreleased) +================== + +* Add support for django CMS 3.7 / Django 2.2 +* Remove support for Django < 1.11 / Python 3.4 + 0.8.5 (2019-03-22) ================== diff --git a/README.rst b/README.rst index 55b3dc1..cb7d65b 100644 --- a/README.rst +++ b/README.rst @@ -6,14 +6,11 @@ djangocms-page-meta Meta tag information for django CMS 3 pages -Python: 2.7, 3.4, 3.5. 3.6 +Python: 2.7, 3.5. 3.6, 3.7 -Django: 1.8 to 2.1 +Django: 1.11 to 2.2 -django CMS: 3.4, 3.5, 3.6 - -.. 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 +django CMS: 3.4, 3.5, 3.6, 3.7 ********** @@ -58,8 +55,8 @@ Quickstart Dependencies ============ -* `django-filer`_ >= 1.2 -* `django-meta`_ >= 1.3 +* `django-filer`_ +* `django-meta`_ ************* Documentation diff --git a/cms_helper.py b/cms_helper.py index 2a30641..63df66c 100755 --- a/cms_helper.py +++ b/cms_helper.py @@ -81,3 +81,7 @@ def setup(): if __name__ == '__main__': run() + +if __name__ == 'cms_helper': + # this is needed to run cms_helper in pycharm + setup() diff --git a/djangocms_page_meta/__init__.py b/djangocms_page_meta/__init__.py index d5fc8ce..0dad950 100644 --- a/djangocms_page_meta/__init__.py +++ b/djangocms_page_meta/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, unicode_literals -__version__ = '0.8.5.post1' +__version__ = '0.9.0a1' __author__ = 'Iacopo Spalletti ' default_app_config = 'djangocms_page_meta.apps.PageMetaConfig' diff --git a/djangocms_page_meta/cms_toolbars.py b/djangocms_page_meta/cms_toolbars.py index 769ccb7..449607b 100644 --- a/djangocms_page_meta/cms_toolbars.py +++ b/djangocms_page_meta/cms_toolbars.py @@ -8,15 +8,11 @@ from cms.toolbar_pool import toolbar_pool from cms.utils.i18n import get_language_list, get_language_object from cms.utils.permissions import has_page_permission +from django.urls import NoReverseMatch, reverse from django.utils.translation import ugettext_lazy as _ from .models import PageMeta, TitleMeta -try: - from django.urls import NoReverseMatch, reverse -except ImportError: - from django.core.urlresolvers import NoReverseMatch, reverse - try: from cms.utils import get_cms_setting except ImportError: diff --git a/djangocms_page_meta/settings.py b/djangocms_page_meta/settings.py index abf3329..434eef1 100644 --- a/djangocms_page_meta/settings.py +++ b/djangocms_page_meta/settings.py @@ -7,15 +7,11 @@ def get_setting(name): description_length = getattr( settings, 'PAGE_META_DESCRIPTION_LENGTH', None - ) - if not description_length: - description_length = 320 + ) or 320 tw_description_length = getattr( settings, 'PAGE_META_TWITTER_DESCRIPTION_LENGTH', None - ) - if not tw_description_length: - tw_description_length = 280 + ) or 320 default = { 'PAGE_META_DESCRIPTION_LENGTH': description_length, diff --git a/tox.ini b/tox.ini index 46c71c2..8f6e38a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,34 +1,9 @@ [tox] -envlist = docs,pep8,isort,py{36,35,34,27}-django{21,20,111,110,19,18}-cms{36,35,34} +envlist = docs,pep8,isort,py{37,36,35}-django{22}-cms{37},py{37,36,35}-django{21}-cms{37,36},py{37,36,35,27}-django{111}-cms{37,36,35,34} [testenv] commands = {env:COMMAND:python} setup.py test deps = - django18: Django>=1.8,<1.9 - django18: django-mptt>=0.8,<0.9 - django18: django-taggit>=0.18,<0.22 - django18: django-polymorphic<0.9 - django18: djangocms-page-tags<0.7 - django18: djangocms-helper<1.1 - django18: django-sekizai<1.0 - django18: django-classy-tags<0.9 - django19: Django>=1.9,<1.10 - django19: django-mptt>=0.8,<0.9 - django19: django-taggit>=0.18,<0.22 - django19: django-polymorphic<0.9 - django19: djangocms-page-tags<0.7 - django19: djangocms-helper<1.1 - django19: django-sekizai<1.0 - django19: django-classy-tags<0.9 - django110: Django>=1.10,<1.11 - django110: django-mptt>=0.8,<0.9 - django110: django-taggit>=0.18,<0.22 - django110: django-polymorphic>=0.9,<2.0 - django110: django-filer>=1.3,<1.4 - django110: djangocms-page-tags<0.7 - django110: djangocms-helper<1.1 - django110: django-sekizai<1.0 - django110: django-classy-tags<0.9 django111: Django>=1.11,<2.0 django111: django-mptt>=0.8 django111: django-taggit>=0.18,<0.24 @@ -49,9 +24,16 @@ deps = django21: django-polymorphic>=0.9 django21: djangocms-page-tags>=0.6.2 django21: djangocms-helper>1.0,<1.3 + django22: Django>=2.2,<2.3 + django22: django-mptt>=0.8 + django22: django-taggit>=0.24 + django22: django-polymorphic>=0.9 + django22: djangocms-page-tags>=0.6.2 + django22: djangocms-helper>1.2 cms34: https://github.com/divio/django-cms/archive/release/3.4.x.zip cms35: https://github.com/divio/django-cms/archive/release/3.5.x.zip cms36: https://github.com/divio/django-cms/archive/release/3.6.x.zip + cms37: https://github.com/divio/django-cms/archive/release/3.7.x.zip -r{toxinidir}/requirements-test.txt [testenv:pep8]