From ca6250c6372681a83319c9280fff8afcbbce0cb055ac94cebcbbbfe241ac868c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 12 Feb 2021 11:01:58 +0000 Subject: [PATCH] Accepting request 871404 from home:gladiac:mailman3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to version 1.3.4 * Sync owners and moderators from Mailman Core for MailingList. (Fixes #302) * Implemented a new HYPERKITTY_JOBS_UPDATE_INDEX_LOCK_LIFE setting to set the lock lifetime for the update_and_clean_index job. (Closes #300) * Implemented a new HYPERKITTY_ALLOW_WEB_POSTING that allows disabling the web posting feature. (Closes #264) * Add the ability to disable Gravatar using HYPERKITTY_ENABLE_GRAVATAR settings. (Closes #303) * Replaced deprecated ugettext functions with gettext. (Closes #310) * Fix export of Email message where the In-Reply-To header doesn’t include the <> brackets. (Closes #331) * We now catch a few more exceptions in hyperkitty_import when getting messages from a mbox. (Closes #313 and #314) * Added a new contrib/check_hk_import script to check mboxes before running hyperkitty_import. * We now ignore a ValueError in hyperkitty_import when trying to replace a Subject: header. (Closes #317) * hyperkitty_import now includes the mbox name in error messages when importing multiple mboxes. (Closes #318) * `` at `` is now only replaced with @ in From: header values when necessary and not unconditionally. (Closes #320) * The wildcard notation for any host '*' is now supported into MAILMAN_ARCHVER_FROM to disable Hyperkitty clients IP checking. * Join the searchbar and search button like it was before bootstrap 4 migration. (See !301) * Use the umd builds for popper.js instead of the regular ones. (See !309) * Exceptions thrown by smtplib in sending replies are now caught and give an appropriate error message. (Closes #309) - Removed hyperkitty-fix-tests.patch - Fixed build on tumbleweed OBS-URL: https://build.opensuse.org/request/show/871404 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-HyperKitty?expand=0&rev=34 --- HyperKitty-1.3.3.tar.gz | 3 -- HyperKitty-1.3.4.tar.gz | 3 ++ hyperkitty-fix-tests.patch | 78 -------------------------------------- python-HyperKitty.changes | 34 +++++++++++++++++ python-HyperKitty.spec | 10 ++--- 5 files changed, 42 insertions(+), 86 deletions(-) delete mode 100644 HyperKitty-1.3.3.tar.gz create mode 100644 HyperKitty-1.3.4.tar.gz delete mode 100644 hyperkitty-fix-tests.patch diff --git a/HyperKitty-1.3.3.tar.gz b/HyperKitty-1.3.3.tar.gz deleted file mode 100644 index ae4a814..0000000 --- a/HyperKitty-1.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b628d2e45878cce78505a474a64c0960da1be784e9f63456d1aad86a70ca055d -size 1936346 diff --git a/HyperKitty-1.3.4.tar.gz b/HyperKitty-1.3.4.tar.gz new file mode 100644 index 0000000..913eea7 --- /dev/null +++ b/HyperKitty-1.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f78fe0a89ece0a7b42c0c0f107ba9de40ffdb65b7ad7dd812e745c678c4570d1 +size 2385311 diff --git a/hyperkitty-fix-tests.patch b/hyperkitty-fix-tests.patch deleted file mode 100644 index 0a428fa..0000000 --- a/hyperkitty-fix-tests.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 0e46371f0f2aab8618aa2852ea6f63c245e16927 Mon Sep 17 00:00:00 2001 -From: David Runge -Date: Sat, 7 Nov 2020 01:14:04 +0000 -Subject: [PATCH] Make migration compatible with django >= 3.1 - -hyperkitty/migrations/0013_mailinglist_id_1.py: -With django >= 3.1 the state.models.fields are represented as dicts, -while with django < 3.1 they are represented as lists. -Accomodate both use-cases by checking the type of the fields before -trying to add to them. - -Fixes #329 ---- - .../migrations/0013_mailinglist_id_1.py | 33 ++++++++++-- - setup.py | 2 +- - tox.ini | 5 +- - 4 files changed, 62 insertions(+), 28 deletions(-) - -diff --git a/hyperkitty/migrations/0013_mailinglist_id_1.py b/hyperkitty/migrations/0013_mailinglist_id_1.py -index f460daf9..d55afed5 100644 ---- a/hyperkitty/migrations/0013_mailinglist_id_1.py -+++ b/hyperkitty/migrations/0013_mailinglist_id_1.py -@@ -16,10 +16,35 @@ class MailingListPrimaryKey(migrations.AlterField): - ) - - def state_forwards(self, app_label, state): -- state.models[app_label, self.model_name_lower].fields.insert(0, ( -- "id", models.AutoField( -- name="id", auto_created=True, primary_key=True, serialize=False, -- verbose_name='ID'))) -+ # django < 3.1 -+ if type(state.models[app_label, self.model_name_lower].fields) is list: -+ state.models[app_label, self.model_name_lower].fields.insert( -+ 0, -+ ( -+ "id", -+ models.AutoField( -+ name="id", -+ auto_created=True, -+ primary_key=True, -+ serialize=False, -+ verbose_name='ID' -+ ) -+ ) -+ ) -+ # django >= 3.1 -+ else: -+ state.models[app_label, self.model_name_lower].fields.update( -+ { -+ "id": -+ models.AutoField( -+ name="id", -+ auto_created=True, -+ primary_key=True, -+ serialize=False, -+ verbose_name='ID', -+ ) -+ } -+ ) - super(MailingListPrimaryKey, self).state_forwards(app_label, state) - - def database_forwards(self, app_label, schema_editor, from_state, to_state): -diff --git a/setup.py b/setup.py -index cb058659..0968c676 100755 ---- a/setup.py -+++ b/setup.py -@@ -37,7 +37,7 @@ with open('hyperkitty/__init__.py') as fp: - - # Requirements - REQUIRES = [ -- "Django>=2.0,<3.1", -+ "Django>=2.2,<3.2", - "django_mailman3>=1.3.3", - "django-gravatar2>=1.0.6", - "djangorestframework>=3.0.0", --- -GitLab - diff --git a/python-HyperKitty.changes b/python-HyperKitty.changes index 7f78041..201da0b 100644 --- a/python-HyperKitty.changes +++ b/python-HyperKitty.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Wed Feb 3 12:29:57 UTC 2021 - Andreas Schneider + +- Update to version 1.3.4 + * Sync owners and moderators from Mailman Core for MailingList. (Fixes #302) + * Implemented a new HYPERKITTY_JOBS_UPDATE_INDEX_LOCK_LIFE setting to set the + lock lifetime for the update_and_clean_index job. (Closes #300) + * Implemented a new HYPERKITTY_ALLOW_WEB_POSTING that allows disabling the + web posting feature. (Closes #264) + * Add the ability to disable Gravatar using HYPERKITTY_ENABLE_GRAVATAR + settings. (Closes #303) + * Replaced deprecated ugettext functions with gettext. (Closes #310) + * Fix export of Email message where the In-Reply-To header doesn’t include + the <> brackets. (Closes #331) + * We now catch a few more exceptions in hyperkitty_import when getting + messages from a mbox. (Closes #313 and #314) + * Added a new contrib/check_hk_import script to check mboxes before running + hyperkitty_import. + * We now ignore a ValueError in hyperkitty_import when trying to replace a + Subject: header. (Closes #317) + * hyperkitty_import now includes the mbox name in error messages when + importing multiple mboxes. (Closes #318) + * `` at `` is now only replaced with @ in From: header values when necessary + and not unconditionally. (Closes #320) + * The wildcard notation for any host '*' is now supported into + MAILMAN_ARCHVER_FROM to disable Hyperkitty clients IP checking. + * Join the searchbar and search button like it was before bootstrap 4 + migration. (See !301) + * Use the umd builds for popper.js instead of the regular ones. (See !309) + * Exceptions thrown by smtplib in sending replies are now caught and give an + appropriate error message. (Closes #309) +- Removed hyperkitty-fix-tests.patch +- Fixed build on tumbleweed + ------------------------------------------------------------------- Mon Dec 28 08:32:51 UTC 2020 - Andreas Schneider diff --git a/python-HyperKitty.spec b/python-HyperKitty.spec index a106ef8..c711431 100644 --- a/python-HyperKitty.spec +++ b/python-HyperKitty.spec @@ -1,7 +1,7 @@ # # spec file for package python-HyperKitty # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,8 +33,11 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +%if 0%{?suse_version} >= 1550 +%define skip_python36 1 +%endif Name: python-HyperKitty -Version: 1.3.3 +Version: 1.3.4 Release: 0 Summary: A web interface to access GNU Mailman v3 archives License: GPL-3.0-only @@ -54,9 +57,6 @@ Source22: hyperkitty-runjob.timer Source30: README.SUSE.md # Patch0: hyperkitty-settings.patch -# Make migration compatible with django >= 3.1 -# https://gitlab.com/mailman/hyperkitty/-/commit/0e46371f0f2aab8618aa2852ea6f63c245e16927.patch -Patch1: hyperkitty-fix-tests.patch # BuildRequires: %{python_module django-debug-toolbar >= 2.2} BuildRequires: %{python_module isort}