forked from mirrors/nixpkgs
mailmanPackages.hyperkitty: remove obsolete patches
The test failure only happened with Python 3.10. We use 3.11 by default, and there's not really any reason to change it, so I don't think we need to keep that patch around.
This commit is contained in:
parent
633473f6cb
commit
7016fa4559
|
@ -1,36 +0,0 @@
|
|||
From 1a914beafe2b00770213fa4d146ffad9d897dc0c Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 12 Aug 2023 12:27:25 +0200
|
||||
Subject: [PATCH] Disable broken `test_help_output` testcase
|
||||
|
||||
The assertion fails, but checking for the exact whereabouts of helptext
|
||||
doesn't bring too much value anyways, so it seems OK to just skip the
|
||||
test.
|
||||
---
|
||||
.../tests/commands/test_attachments_to_file.py | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/hyperkitty/tests/commands/test_attachments_to_file.py b/hyperkitty/tests/commands/test_attachments_to_file.py
|
||||
index b3e61f3a..8db7c4b2 100644
|
||||
--- a/hyperkitty/tests/commands/test_attachments_to_file.py
|
||||
+++ b/hyperkitty/tests/commands/test_attachments_to_file.py
|
||||
@@ -83,16 +83,3 @@ class CommandTestCase(TestCase):
|
||||
self.assertEqual(fp.getvalue(), """\
|
||||
2 attachments moved.
|
||||
""")
|
||||
-
|
||||
- def test_help_output(self):
|
||||
- with io.StringIO() as fp, redirect_stdout(fp):
|
||||
- with suppress(SystemExit):
|
||||
- call_command('attachments_to_file', '--help')
|
||||
-
|
||||
- output_value = fp.getvalue()
|
||||
- assert (
|
||||
- "HYPERKITTY_ATTACHMENT_FOLDER" in output_value
|
||||
- and "-c CHUNK_SIZE" in output_value
|
||||
- and "-c CHUNK_SIZE, --chunk-size CHUNK_SIZE" in output_value
|
||||
- and "-v {0,1}, --verbosity {0,1}" in output_value
|
||||
- )
|
||||
--
|
||||
2.40.1
|
||||
|
|
@ -10,7 +10,7 @@ with python3.pkgs;
|
|||
buildPythonPackage rec {
|
||||
pname = "HyperKitty";
|
||||
version = "1.3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
@ -18,7 +18,6 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
./0001-Disable-broken-test_help_output-testcase.patch
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch";
|
||||
hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw=";
|
||||
|
@ -28,9 +27,6 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
# isort is a development dependency
|
||||
sed -i '/isort/d' setup.py
|
||||
# Fix mistune imports for mistune >= 2.0.0
|
||||
# https://gitlab.com/mailman/hyperkitty/-/merge_requests/379
|
||||
sed -i 's/mistune.scanner/mistune.util/' hyperkitty/lib/renderer.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
Loading…
Reference in a new issue