From 2290e84ef9a720264c4b642f69a7f1608a0c085b Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Wed, 3 Aug 2016 14:46:28 +0200 Subject: [PATCH 1/6] Pin html5lib --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index edaefe0..ae85931 100644 --- a/tox.ini +++ b/tox.ini @@ -38,6 +38,7 @@ deps = knocker: https://github.com/nephila/django-knocker/archive/master.zip?0.1.1 knocker: djangocms-text-ckeditor<3.0 django-meta>=1.2 + html5lib<0.99999999 https://github.com/nephila/djangocms-helper/archive/develop.zip https://github.com/aldryn/aldryn-apphooks-config/archive/master.zip https://github.com/nephila/djangocms-apphook-setup/archive/master.zip From 8f58eaeec183d98c0b9adfbd9135ca974f29482f Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Wed, 3 Aug 2016 12:22:19 +0200 Subject: [PATCH 2/6] Release 0.8.6 --- HISTORY.rst | 2 +- djangocms_blog/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index d806bec..b2330e2 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,7 +5,7 @@ History ======= ****************** -0.8.6 (unreleased) +0.8.6 (2016-08-03) ****************** * Set the correct language during indexing diff --git a/djangocms_blog/__init__.py b/djangocms_blog/__init__.py index a1b97a5..c22d7dc 100644 --- a/djangocms_blog/__init__.py +++ b/djangocms_blog/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- __author__ = 'Iacopo Spalletti' __email__ = 'i.spalletti@nephila.it' -__version__ = '0.8.5' +__version__ = '0.8.6' default_app_config = 'djangocms_blog.apps.BlogAppConfig' From 6dd9176617a723c812aa19c547c426f770780942 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Tue, 23 Aug 2016 19:59:22 +0200 Subject: [PATCH 3/6] xAdd support for django CMS 3.4 --- .travis.yml | 16 ++++++++ .../migrations/0021_auto_20160823_2008.py | 41 +++++++++++++++++++ setup.py | 1 + tests/test_models.py | 4 +- tox.ini | 6 ++- 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 djangocms_blog/migrations/0021_auto_20160823_2008.py diff --git a/.travis.yml b/.travis.yml index 67278a0..beb8d7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,12 @@ env: matrix: - TOXENV='pep8' - TOXENV='isort' + - DJANGO='django19' CMS='cms34' + - DJANGO='django19' CMS='cms33' - DJANGO='django19' CMS='cms32' - DJANGO='django19' CMS='knocker' + - DJANGO='django18' CMS='cms34' + - DJANGO='django18' CMS='cms33' - DJANGO='django18' CMS='cms32' - DJANGO='django18' CMS='cms31' - DJANGO='django17' CMS='cms32' @@ -73,12 +77,24 @@ matrix: 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: 2.6 env: DJANGO='django19' CMS='knocker' - 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.3 env: DJANGO='django19' CMS='knocker' - python: 3.5 diff --git a/djangocms_blog/migrations/0021_auto_20160823_2008.py b/djangocms_blog/migrations/0021_auto_20160823_2008.py new file mode 100644 index 0000000..5ab8fb4 --- /dev/null +++ b/djangocms_blog/migrations/0021_auto_20160823_2008.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.9 on 2016-08-23 18:08 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('djangocms_blog', '0020_thumbnail_move4'), + ] + + operations = [ + migrations.AlterField( + model_name='authorentriesplugin', + name='cmsplugin_ptr', + field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='djangocms_blog_authorentriesplugin', serialize=False, to='cms.CMSPlugin'), + ), + migrations.AlterField( + model_name='genericblogplugin', + name='cmsplugin_ptr', + field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='djangocms_blog_genericblogplugin', serialize=False, to='cms.CMSPlugin'), + ), + migrations.AlterField( + model_name='latestpostsplugin', + name='cmsplugin_ptr', + field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='djangocms_blog_latestpostsplugin', serialize=False, to='cms.CMSPlugin'), + ), + migrations.AlterField( + model_name='post', + name='main_image_full', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='djangocms_blog_post_full', to='filer.ThumbnailOption', verbose_name='main image full'), + ), + migrations.AlterField( + model_name='post', + name='main_image_thumbnail', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='djangocms_blog_post_thumbnail', to='filer.ThumbnailOption', verbose_name='main image thumbnail'), + ), + ] diff --git a/setup.py b/setup.py index 1d7fdc9..dae671b 100755 --- a/setup.py +++ b/setup.py @@ -60,6 +60,7 @@ setup( 'Framework :: Django :: 1.6', 'Framework :: Django :: 1.7', 'Framework :: Django :: 1.8', + 'Framework :: Django :: 1.9', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', diff --git a/tests/test_models.py b/tests/test_models.py index befba6b..f94c3e0 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -733,7 +733,7 @@ class ModelsTest(BaseTest): else: plugins = list(post1.content.cmsplugin_set.filter(language='en').order_by('path', 'depth', 'position')) copy_plugins_to(plugins, post2.content) - new = downcast_plugins(post2.content.cmsplugin_set.all()) + new = list(downcast_plugins(post2.content.cmsplugin_set.all())) self.assertEqual(set(new[0].tags.all()), set([tag1, tag2])) self.assertEqual(set(new[0].tags.all()), set(plugin.tags.all())) @@ -766,7 +766,7 @@ class ModelsTest(BaseTest): else: plugins = list(post1.content.cmsplugin_set.filter(language='en').order_by('path', 'depth', 'position')) copy_plugins_to(plugins, post2.content) - new = downcast_plugins(post2.content.cmsplugin_set.all()) + new = list(downcast_plugins(post2.content.cmsplugin_set.all())) self.assertEqual(set(new[0].authors.all()), set([self.user])) def test_multisite(self): diff --git a/tox.ini b/tox.ini index ae85931..f339fb7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = pep8,isort,py{35,34,27}-django{19}-{cms33,cms32,knocker},py{35,34,33,27}-django{18}-cms{33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30} +envlist = pep8,isort,py{35,34,27}-django{19}-{cms34,cms33,cms32,knocker},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} [testenv] commands = {env:COMMAND:python} cms_helper.py test djangocms_blog @@ -34,7 +34,9 @@ deps = cms32: djangocms-text-ckeditor<3.0 cms33: https://github.com/divio/django-cms/archive/release/3.3.x.zip cms33: djangocms-text-ckeditor>=3.0 - knocker: https://github.com/divio/django-cms/archive/release/3.2.x.zip + cms34: https://github.com/divio/django-cms/archive/develop.zip + cms34: djangocms-text-ckeditor>=3.0 + knocker: https://github.com/divio/django-cms/archive/release/3.3.x.zip knocker: https://github.com/nephila/django-knocker/archive/master.zip?0.1.1 knocker: djangocms-text-ckeditor<3.0 django-meta>=1.2 From 4529f9b8ddceebf0e545e30df45ea0d3b148e814 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 25 Aug 2016 15:31:15 +0200 Subject: [PATCH 4/6] Do not cache sites in the admin --- djangocms_blog/admin.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/djangocms_blog/admin.py b/djangocms_blog/admin.py index 1e834bc..5d8a799 100755 --- a/djangocms_blog/admin.py +++ b/djangocms_blog/admin.py @@ -142,12 +142,10 @@ class PostAdmin(PlaceholderAdminMixin, FrontendEditableAdminMixin, :param request: current request :return: boolean or a queryset of available sites """ - if self._sites is None: - try: - self._sites = request.user.get_sites() - except AttributeError: # pragma: no cover - self._sites = Site.objects.none() - return self._sites + try: + return request.user.get_sites() + except AttributeError: # pragma: no cover + return Site.objects.none() def _set_config_defaults(self, request, form, obj=None): form = super(PostAdmin, self)._set_config_defaults(request, form, obj) From 3b1e2de01620cbafc536395ff460fef0b0e9c529 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 25 Aug 2016 15:40:19 +0200 Subject: [PATCH 5/6] Update PO --- djangocms_blog/locale/fr/LC_MESSAGES/django.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/djangocms_blog/locale/fr/LC_MESSAGES/django.po b/djangocms_blog/locale/fr/LC_MESSAGES/django.po index 7c58a9b..f07e7db 100644 --- a/djangocms_blog/locale/fr/LC_MESSAGES/django.po +++ b/djangocms_blog/locale/fr/LC_MESSAGES/django.po @@ -3,12 +3,13 @@ # # Translators: # Iacopo Spalletti, 2014 +# yakky , 2016 msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-05 08:48+0200\n" -"PO-Revision-Date: 2016-05-05 06:48+0000\n" +"PO-Revision-Date: 2016-08-25 13:38+0000\n" "Last-Translator: yakky \n" "Language-Team: French (http://www.transifex.com/nephila/djangocms-blog/language/fr/)\n" "MIME-Version: 1.0\n" @@ -41,12 +42,12 @@ msgstr "Nom de l’objet" #: cms_appconfig.py:27 #| msgid "blog categories" msgid "blog config" -msgstr "Catégorie du blog" +msgstr "Configuration du blog" #: cms_appconfig.py:28 #| msgid "blog categories" msgid "blog configs" -msgstr "Catégories du blog" +msgstr "Configurations du blog" #: cms_appconfig.py:31 msgid "untitled" @@ -183,7 +184,7 @@ msgstr "" #: cms_menus.py:28 msgid "Blog menu" -msgstr "Catégorie du blog" +msgstr "Menu du blog" #: cms_toolbar.py:23 msgid "Post list" From 4389b2408edf4e894a7e4e3ef2eeaf2aafb8290f Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 25 Aug 2016 22:07:12 +0200 Subject: [PATCH 6/6] Release 0.8.7 --- HISTORY.rst | 8 ++++++++ djangocms_blog/__init__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index b2330e2..2a08fd5 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,14 @@ History ======= +****************** +0.8.7 (2016-08-25) +****************** + +* Added support for django CMS 3.4 +* Added support for django 1.10 +* Fixed issue with multisite support + ****************** 0.8.6 (2016-08-03) ****************** diff --git a/djangocms_blog/__init__.py b/djangocms_blog/__init__.py index c22d7dc..1efadde 100644 --- a/djangocms_blog/__init__.py +++ b/djangocms_blog/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- __author__ = 'Iacopo Spalletti' __email__ = 'i.spalletti@nephila.it' -__version__ = '0.8.6' +__version__ = '0.8.7' default_app_config = 'djangocms_blog.apps.BlogAppConfig'