From patchwork Tue Sep 6 12:59:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42251 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 4663327BBEA; Tue, 6 Sep 2022 15:36:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2186B27BBE9 for ; Tue, 6 Sep 2022 15:36:14 +0100 (BST) Received: from localhost ([::1]:44860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVZgS-0002tm-SE for patchwork@mira.cbaines.net; Tue, 06 Sep 2022 10:36:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVYBO-0005uv-IN for guix-patches@gnu.org; Tue, 06 Sep 2022 09:00:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVYBO-00036B-4c for guix-patches@gnu.org; Tue, 06 Sep 2022 09:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oVYBO-0007nt-1V for guix-patches@gnu.org; Tue, 06 Sep 2022 09:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57587] [PATCH v3] gnu: python-apsw: Update to 3.39.2.1. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Sep 2022 13:00:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57587@debbugs.gnu.org Cc: Christopher Baines Received: via spool by 57587-submit@debbugs.gnu.org id=B57587.166246916829914 (code B ref 57587); Tue, 06 Sep 2022 13:00:01 +0000 Received: (at 57587) by debbugs.gnu.org; 6 Sep 2022 12:59:28 +0000 Received: from localhost ([127.0.0.1]:50063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVYAp-0007mP-FK for submit@debbugs.gnu.org; Tue, 06 Sep 2022 08:59:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:54138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVYAn-0007m9-Ct for 57587@debbugs.gnu.org; Tue, 06 Sep 2022 08:59:26 -0400 Date: Tue, 06 Sep 2022 20:59:08 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662469159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DEFMHZPJTP4N4DuiNiBPkJWqe+7f6jXiKl8dsRTtHqc=; b=SKM7sQE6AknS4r1rG/jewQuxK2lmYJoXn3SykDWsqpkBGWvMPL6ZgAgv1PhGDp9qfrwc9S OwWAJImFNBJnBCzorRkaBF6WPaN4NNMjz0Hzh4KGlyHe8YLDQH4kwZpUeMmD8GTt+ZkWph mnJdZHlrWz2B7Vzussa18wuVR426wVvJybbobRVAIOmeFtSU8Rd2PJTCrywDt3cJMoyFlM onB2YDvpBF/PXcWVNS4+jviKgKYR+EAysPsCQcaHweEnHwzv0ga+SnputHjQ/VAZjtyB8o 4sIKGqDApKUplX8huOoJtP1WH2FCL8RBS/uSSwWFS+WrcRI6XIZ/W5bOcYk3Vg== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches From 95fd5f63cbab6890f7280374f9278fd9811513a3 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 6 Sep 2022 20:30:45 +0800 * gnu/packages/databases.scm (python-apsw): Update to 3.39.2.1. [source]: Change back to compressed release. * gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch: New file. * gnu/local.mk: Add patch. --- Oops! Previous mail has a bad format, resend. \>_ v3: Calibre compiles now. gnu/local.mk | 1 + gnu/packages/databases.scm | 18 ++++++++----- .../python-apsw-3.39.2.1-test-fix.patch | 27 +++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch base-commit: 7ae51b741a6b73d3b2730389ed5291e00d7e5c0a -- 2.37.2 diff --git a/gnu/local.mk b/gnu/local.mk index e454189b8b..19102113c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1694,6 +1694,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-hurd-configure.patch \ %D%/packages/patches/python-3-no-static-lib.patch \ + %D%/packages/patches/python-apsw-3.39.2.1-test-fix.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-cross-compile.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7edf0fed2d..9540b61920 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3568,18 +3568,22 @@ (define-public python-pickleshare (define-public python-apsw (package (name "python-apsw") - (version "3.39.2.0") + (version "3.39.2.1") + ;; The compressed release has fetching functionality disabled. (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rogerbinns/apsw") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append + "https://github.com/rogerbinns/apsw/releases/download/" + version "/apsw-" version ".zip")) (sha256 (base32 - "0q7fnk8n3m5mpjzh6xyhj409k8sacdbjsfis98my9c50fdn5sr7y")))) + "06x3qgg71xz8l3kz8gz04wkfp5f6zfrg476a4mm1c5hikqyw6ykj")) + ;; Cherry-picked from upstream, remove when bumping to 3.39.3. + (patches + (search-patches "python-apsw-3.39.2.1-test-fix.patch")))) (build-system python-build-system) + (native-inputs (list unzip)) (inputs (list sqlite-next)) ;SQLite 3.39 required. (arguments (list #:phases diff --git a/gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch b/gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch new file mode 100644 index 0000000000..cc233e3ccd --- /dev/null +++ b/gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch @@ -0,0 +1,27 @@ +From 1111f902075169bd0d96cdd10607ef8499f0fed5 Mon Sep 17 00:00:00 2001 +From: Roger Binns +Date: Mon, 5 Sep 2022 07:12:25 -0700 +Subject: [PATCH] Deal with mismatched SQLITE_ENABLE_COLUMN_METADATA + +Address #363 +--- + apsw/tests.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/apsw/tests.py b/apsw/tests.py +index b4a94d3..256ead0 100644 +--- a/apsw/tests.py ++++ b/apsw/tests.py +@@ -772,8 +772,8 @@ class APSW(unittest.TestCase): + c.execute("drop table foo; create table foo (%s)" % (", ".join(["[%s] %s" % (n, t) for n, t in cols]), )) + c.execute("insert into foo([x a space]) values(1)") + c.execute("create temp table two(fred banana); insert into two values(7); create temp view three as select fred as [a space] from two") +- has_full=any(o=="ENABLE_COLUMN_METADATA" or o.startswith("ENABLE_COLUMN_METADATA=") for o in apsw.compile_options) ++ has_full=any(o=="ENABLE_COLUMN_METADATA" or o.startswith("ENABLE_COLUMN_METADATA=") for o in apsw.compile_options) if apsw.using_amalgamation else hasattr(c, "description_full") + for row in c.execute("select * from foo"): + self.assertEqual(cols, c.getdescription()) + self.assertEqual(has_full, hasattr(c, "description_full")) + +base-commit: f628374c5857d940067ef26c9ea4e85a08a94f76 +-- +2.37.2