From patchwork Fri May 3 16:42:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13872 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 32AAF16F93; Fri, 3 May 2019 17:45:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BA6B216F91 for ; Fri, 3 May 2019 17:45:21 +0100 (BST) Received: from localhost ([127.0.0.1]:44442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJJ-0005l0-6o for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:45:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbJ2-0005Sx-Jt for guix-patches@gnu.org; Fri, 03 May 2019 12:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbJ1-0004sK-5o for guix-patches@gnu.org; Fri, 03 May 2019 12:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36005) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbJ0-0004rB-DR for guix-patches@gnu.org; Fri, 03 May 2019 12:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbJ0-0007MK-8s for guix-patches@gnu.org; Fri, 03 May 2019 12:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 13/24] gnu: calibre: Disable bs4 test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.155690185228074 (code B ref 35446); Fri, 03 May 2019 16:45:02 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:12 +0000 Received: from localhost ([127.0.0.1]:49518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbIB-0007IX-Ds for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:11 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI8-0007GJ-5h for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:44:08 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id B9A5B4DBA7 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:44:02 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556901842; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gLz+cpE7NJrtyBN4ajcSrqQhUzzSHxZ+9Zal2wxNtzM=; b=T9NKi6smRdrXiVLlMXMObbpiuHllSbcKJY5OuZfyOpG5RdzC/g15M/PAiQgLfJQrcxfG7A 2eZIbaYJ2cm8NMPB5/y9wpzmxqHGptqeFPlcQugAO9/IjxLz0sLD43RxOHg89QJEG6Ff59 NufYrNljIj4PYNnKSNSxLOqXiOMK/CP9e4cloZfMpNoskaiGo0JIMy5Qi3Nm6n1p1BnPL9 gkyZI5jHz5IQ8MfMbgneTOhH8YhDcmlojkPY4WjMLR+gRirSCTcvC11GsZXvThCpZ+HmK8 chHRECJjRojpSmKOI2gUpL89kDdMnKgtlk0BzZT1lKSXG/jLmeNKU/Px4rTH/w== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id pnkCunjLHrHa for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:52 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:21 +1000 Message-Id: <20190503164232.1799-13-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 +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('

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 +