GNU bug report logs -
#35446
[PATCH 0/26] Calibre: Update to 3.41.3
Previous Next
Reported by: Brendan Tildesley <mail <at> brendan.scot>
Date: Sat, 27 Apr 2019 09:29:02 UTC
Severity: normal
Tags: patch
Done: Danny Milosavljevic <dannym <at> scratchpost.org>
Bug is archived. No further changes may be made.
Full log
Message #134 received at 35446 <at> debbugs.gnu.org (full text, mbox):
* gnu/local.mk: Reference patch
gnu/packages/ebook.scm (calibre)[origin]: Enable patch.
gnu/packages/patches/calibre-remove-test-bs4.patch: New file.
In my efforts to fix all Calibre tests, this test would always complain about
backports.functools_lru_cache not existing even after I packaged and added
python2-soupsieve as an input and confirmed it was in the
PYTHONPATH. Currently Calibre does not actually use it for anything other than
testing it's there, so I assume they will start using it in future Calibre
versions.
---
gnu/local.mk | 1 +
gnu/packages/ebook.scm | 1 +
.../patches/calibre-remove-test-bs4.patch | 27 +++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 100644 gnu/packages/patches/calibre-remove-test-bs4.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index d5b7a2c5e5..9e31868281 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -690,6 +690,7 @@ dist_patch_DATA = \
%D%/packages/patches/boost-fix-icu-build.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \
+ %D%/packages/patches/calibre-remove-test-bs4.patch \
%D%/packages/patches/calibre-remove-test-unrar.patch \
%D%/packages/patches/casync-renameat2-declaration.patch \
%D%/packages/patches/catdoc-CVE-2017-11110.patch \
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 964fdd7b75..05a9b96d35 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -97,6 +97,7 @@
(delete-file "src/odf/thumbnail.py")
#t))
(patches (search-patches "calibre-no-updates-dialog.patch"
+ "calibre-remove-test-bs4.patch" ;; TODO: fix test.
"calibre-remove-test-unrar.patch"))))
(build-system python-build-system)
(native-inputs
diff --git a/gnu/packages/patches/calibre-remove-test-bs4.patch b/gnu/packages/patches/calibre-remove-test-bs4.patch
new file mode 100644
index 0000000000..2c566baeb6
--- /dev/null
+++ b/gnu/packages/patches/calibre-remove-test-bs4.patch
@@ -0,0 +1,27 @@
+From 2738dd42caebe55326c76922a12ba8740bdb22e7 Mon Sep 17 00:00:00 2001
+From: Brendan Tildesley <mail <at> brendan.scot>
+Date: Sat, 27 Apr 2019 00:42:39 +1000
+Subject: [PATCH] Remove test_bs4
+
+---
+ src/calibre/test_build.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
+index 73f1172e8c..07bdffd3e5 100644
+--- a/src/calibre/test_build.py
++++ b/src/calibre/test_build.py
+@@ -73,10 +73,6 @@ class BuildTest(unittest.TestCase):
+ from html5_parser import parse
+ parse('<p>xxx')
+
+- def test_bs4(self):
+- import soupsieve, bs4
+- del soupsieve, bs4
+-
+ def test_zeroconf(self):
+ if ispy3:
+ import zeroconf as z, ifaddr
+--
+2.21.0
+
--
2.21.0
This bug report was last modified 6 years and 76 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.