From 79768e571ec1888f9aa5ca6ab83c213690c9a245 Mon Sep 17 00:00:00 2001 From: David THENON Date: Sat, 27 Feb 2021 02:46:58 +0100 Subject: [PATCH] [NEW] Release 0.9.1 --- README.rst | 26 +++++++++++++---- cmsplugin_zinnia/__init__.py | 6 ++-- .../migrations/0005_update_template_field.py | 28 +++++++++++++++++++ .../0006_use_booleanfield_null_true.py | 18 ++++++++++++ cmsplugin_zinnia/models.py | 2 +- setup.py | 7 ++++- 6 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 cmsplugin_zinnia/migrations/0005_update_template_field.py create mode 100644 cmsplugin_zinnia/migrations/0006_use_booleanfield_null_true.py diff --git a/README.rst b/README.rst index 40bc372..7d56d90 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,7 @@ +.. _django-blog-zinnia: http://django-blog-zinnia.com/ +.. _django-blog-xinnia: https://github.com/emencia/django-blog-xinnia +.. _django-cms: http://django-cms.com/ + ======================== emencia-cmsplugin-xinnia ======================== @@ -6,12 +10,13 @@ emencia-cmsplugin-xinnia This is a fork of `emencia-cmsplugin-zinnia `_ (which was a fork of original "cmsplugin-zinnia") to include fixes for last - Django and DjangoCMS versions with django-blog-xinnia (a fork of django-blog-zinnia). + Django and DjangoCMS versions with `django-blog-xinnia`_ (a fork of + `django-blog-zinnia`_). - Code is almost unchanged except for needed fixes and even package has renamed - "zinnia" to "xinnia", its module has keeped the old name. + Code is almost unchanged except for needed fixes and even if package name + has been renamed "xinnia", its module is still ``cmsplugin_zinnia``. -Cmsplugin-zinnia is a bridge between `django-blog-zinnia`_ and +Cmsplugin-zinnia is a bridge between `django-blog-xinnia`_ and `django-cms`_. This package provides plugins, menus and apphook to integrate your Zinnia @@ -129,8 +134,17 @@ Changelog Previous release history can be find in `original fork `_. -0.9.0 ------ +0.9.1 - 2021/02/27 +------------------ + +* Drop support for Django<2.2 and django-cms<3.7; +* Fix some package informations +* Add missing pending migrations for template fields update from ">0.9"; +* Use ``BooleanField`` with ``null=True`` instead of deprecated + ``NullBooleanField``; + +0.9.0 - 2021/02/23 +------------------ * Remove usage of deprecated ``python_2_unicode_compatible`` in models; * Use ``gettext_lazy`` instead of deprecated ``ugettext_lazy``; diff --git a/cmsplugin_zinnia/__init__.py b/cmsplugin_zinnia/__init__.py index faf76cf..20043ab 100644 --- a/cmsplugin_zinnia/__init__.py +++ b/cmsplugin_zinnia/__init__.py @@ -1,8 +1,8 @@ """cmsplugin_zinnia""" -__version__ = '0.9.0' +__version__ = '0.9.1' __license__ = 'BSD License' -__author__ = 'Emencia', -__email__ = 'support@emencia.com', +__author__ = 'Emencia' +__email__ = 'support@emencia.com' __url__ = 'https://github.com/emencia/emencia-cmsplugin-xinnia' diff --git a/cmsplugin_zinnia/migrations/0005_update_template_field.py b/cmsplugin_zinnia/migrations/0005_update_template_field.py new file mode 100644 index 0000000..6cfdc28 --- /dev/null +++ b/cmsplugin_zinnia/migrations/0005_update_template_field.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.7 on 2021-02-25 02:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cmsplugin_zinnia', '0004_fix_empty_template'), + ] + + operations = [ + migrations.AlterField( + model_name='queryentriesplugin', + name='template_to_render', + field=models.CharField(blank=True, choices=[('cmsplugin_zinnia/entry_list.html', 'Entry list (default)'), ('cmsplugin_zinnia/entry_detail.html', 'Entry detailed'), ('cmsplugin_zinnia/entry_slider.html', 'Entry slider')], default='cmsplugin_zinnia/entry_list.html', help_text='template used to display the plugin', max_length=250, verbose_name='template'), + ), + migrations.AlterField( + model_name='randomentriesplugin', + name='template_to_render', + field=models.CharField(blank=True, choices=[('cmsplugin_zinnia/entry_list.html', 'Entry list (default)'), ('cmsplugin_zinnia/entry_detail.html', 'Entry detailed'), ('cmsplugin_zinnia/entry_slider.html', 'Entry slider')], default='cmsplugin_zinnia/entry_list.html', help_text='template used to display the plugin', max_length=250, verbose_name='template'), + ), + migrations.AlterField( + model_name='selectedentriesplugin', + name='template_to_render', + field=models.CharField(blank=True, choices=[('cmsplugin_zinnia/entry_list.html', 'Entry list (default)'), ('cmsplugin_zinnia/entry_detail.html', 'Entry detailed'), ('cmsplugin_zinnia/entry_slider.html', 'Entry slider')], default='cmsplugin_zinnia/entry_list.html', help_text='template used to display the plugin', max_length=250, verbose_name='template'), + ), + ] diff --git a/cmsplugin_zinnia/migrations/0006_use_booleanfield_null_true.py b/cmsplugin_zinnia/migrations/0006_use_booleanfield_null_true.py new file mode 100644 index 0000000..c1914c3 --- /dev/null +++ b/cmsplugin_zinnia/migrations/0006_use_booleanfield_null_true.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.7 on 2021-02-25 02:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cmsplugin_zinnia', '0005_update_template_field'), + ] + + operations = [ + migrations.AlterField( + model_name='latestentriesplugin', + name='featured', + field=models.BooleanField(blank=True, choices=[(True, 'Show featured entries only'), (False, 'Hide featured entries')], null=True, verbose_name='featured'), + ), + ] diff --git a/cmsplugin_zinnia/models.py b/cmsplugin_zinnia/models.py index 5f6e06f..3b35f11 100644 --- a/cmsplugin_zinnia/models.py +++ b/cmsplugin_zinnia/models.py @@ -12,7 +12,7 @@ class LatestEntriesPlugin(CMSPlugin): CMS Plugin for displaying latest entries """ - featured = models.NullBooleanField( + featured = models.BooleanField( _('featured'), blank=True, null=True, choices=((True, _('Show featured entries only')), diff --git a/setup.py b/setup.py index 04724e3..d7404b5 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,7 @@ description='Django-CMS plugins for django-blog-xinnia', long_description=open('README.rst').read(), + long_description_content_type='text/x-rst', keywords='django, blog, weblog, zinnia, cms, plugins, apphook', @@ -31,5 +32,9 @@ license=cmsplugin_zinnia.__license__, include_package_data=True, - zip_safe=False + zip_safe=False, + install_requires=[ + 'Django>=2.2', + 'django-cms>=3.7', + ] )