Hi maintainers and Fiona, On Sun, 13 Apr 2025 15:08:17 +0200 Fiona Ebner <[email protected]> wrote: > I've opened a merge request on Salsa that should address this: > https://salsa.debian.org/mailman-team/hyperkitty/-/merge_requests/4
Thanks for the patch! I've prepared a team upload (I think it's better than a nmu for team-maintained packages) and I'll upload to DELAYED/2 queue. If you prefer I postpone or cancel the upload, please let me know. There is a debdiff attached and I can push to the repo if given permission (have already asked in salsa) - my changes are in my fork [1]. Cheers, Charles [1] https://salsa.debian.org/charles/hyperkitty
diff -Nru hyperkitty-1.3.12/debian/changelog hyperkitty-1.3.12/debian/changelog --- hyperkitty-1.3.12/debian/changelog 2025-03-10 10:18:33.000000000 -0300 +++ hyperkitty-1.3.12/debian/changelog 2025-04-13 22:54:43.000000000 -0300 @@ -1,3 +1,16 @@ +hyperkitty (1.3.12-3) unstable; urgency=medium + + * Team upload. + + [ Fiona Ebner ] + * Add upstream patch to fix tests after python3-mistune changes. + (Closes: #1102379) + + [ Carlos Henrique Lima Melara ] + * d/p/0005-Changes-to-support-mistune-3.1.patch: improve patch metadata. + + -- Carlos Henrique Lima Melara <[email protected]> Sun, 13 Apr 2025 22:54:43 -0300 + hyperkitty (1.3.12-2) unstable; urgency=medium * Add upstream patch to fix tests after Python 3.13 argparse changes diff -Nru hyperkitty-1.3.12/debian/patches/0005-Changes-to-support-mistune-3.1.patch hyperkitty-1.3.12/debian/patches/0005-Changes-to-support-mistune-3.1.patch --- hyperkitty-1.3.12/debian/patches/0005-Changes-to-support-mistune-3.1.patch 1969-12-31 21:00:00.000000000 -0300 +++ hyperkitty-1.3.12/debian/patches/0005-Changes-to-support-mistune-3.1.patch 2025-04-13 22:53:21.000000000 -0300 @@ -0,0 +1,42 @@ +From 2d69f420c603356a639a6b6243e1059a0089b7eb Mon Sep 17 00:00:00 2001 +From: Mark Sapiro <[email protected]> +Date: Sat, 11 Jan 2025 10:42:53 -0800 +Subject: [PATCH] Changes to support mistune >=3.1. +Bug-Debian: https://bugs.debian.org/1102379 +Origin: upstream, https://gitlab.com/mailman/hyperkitty/-/commit/2d69f420c603356a639a6b6243e1059a0089b7eb +Last-Update: 2025-04-13 +--- + hyperkitty/templatetags/decorate.py | 2 +- + hyperkitty/tests/test_templatetags.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/hyperkitty/templatetags/decorate.py b/hyperkitty/templatetags/decorate.py +index c66066b3..b548d416 100644 +--- a/hyperkitty/templatetags/decorate.py ++++ b/hyperkitty/templatetags/decorate.py +@@ -40,5 +40,5 @@ def render(email, mlist): + return mark_safe(markdown_renderer(content)) + try: + return mark_safe(text_renderer(content)) +- except (KeyError, ValueError): ++ except (AssertionError, KeyError, ValueError): + return mark_safe('<pre>' + content + '</pre>') +diff --git a/hyperkitty/tests/test_templatetags.py b/hyperkitty/tests/test_templatetags.py +index 9570ff9d..063e6a79 100644 +--- a/hyperkitty/tests/test_templatetags.py ++++ b/hyperkitty/tests/test_templatetags.py +@@ -217,9 +217,9 @@ https://some.url/example + # This is another sample text. + """ + result = markdown_renderer(contents) +- self.assertEqual( ++ self.assertRegex( + result.strip(), +- '<p># This is another sample text.</p>') ++ '^(<p># |<h1>)This is another sample text.(</p>|</h1>)$') + + def test_outlook_style_reply_blockquote(self): + contents = """\ +-- +2.47.2 + diff -Nru hyperkitty-1.3.12/debian/patches/series hyperkitty-1.3.12/debian/patches/series --- hyperkitty-1.3.12/debian/patches/series 2025-03-10 10:18:33.000000000 -0300 +++ hyperkitty-1.3.12/debian/patches/series 2025-04-13 22:41:52.000000000 -0300 @@ -2,3 +2,4 @@ 0002_Use_python3_by_default.patch 0003-run-sassc-at-build-time.patch 0004-Update_test_for_python_3.13_argparse_changes.patch +0005-Changes-to-support-mistune-3.1.patch
