From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yD8GELo6l2PUZAEAbAwnHQ (envelope-from ) for ; Mon, 12 Dec 2022 15:29:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +LvwD7o6l2OThAEAauVa8A (envelope-from ) for ; Mon, 12 Dec 2022 15:29:14 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CCEC0123D2 for ; Mon, 12 Dec 2022 15:29:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4jmt-0005bC-0a; Mon, 12 Dec 2022 09:28:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4jmq-0005Vp-0j for guix-patches@gnu.org; Mon, 12 Dec 2022 09:28:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4jmp-0006DP-PV for guix-patches@gnu.org; Mon, 12 Dec 2022 09:28:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4jmp-0007Vo-L6 for guix-patches@gnu.org; Mon, 12 Dec 2022 09:28:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60009] [PATCH 10/18] gnu: python-apsw: Update to 3.40.0.0. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Dec 2022 14:28:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60009@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 60009-submit@debbugs.gnu.org id=B60009.167085527728766 (code B ref 60009); Mon, 12 Dec 2022 14:28:07 +0000 Received: (at 60009) by debbugs.gnu.org; 12 Dec 2022 14:27:57 +0000 Received: from localhost ([127.0.0.1]:53289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4jmf-0007Tp-0R for submit@debbugs.gnu.org; Mon, 12 Dec 2022 09:27:57 -0500 Received: from sender4-of-o50.zoho.com ([136.143.188.50]:21068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4jma-0007Tb-Jo for 60009@debbugs.gnu.org; Mon, 12 Dec 2022 09:27:53 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1670855270; cv=none; d=zohomail.com; s=zohoarc; b=RXr368nFi3h6dZ9PHZjKjiwXaTZfFudNUWBlwah+FXiSbgi2QGZdJEimcpgYhyJcuXrXFPT/b+Z0qgPVY/fDM+aXiHzPdhY1TuYaA993URZQlWrCSKHLJAQ6V6KpKU7bsKQ0Aj72ugjv7adGr0tcW7zT0SO6OJicK83vSBq0zsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670855270; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=6G/FhsMs5jwK6E4PHv0inxXE9ucTF4RLK2hHJepCAxU=; b=TjU6Q0mkimnPtp1Ii91uhRJairwhh6yBnok0V7iRorfDAaynBW/3M1hRr0zviCobT/GkFe9Pb1N7pttMV7adJePn4Ag4jkcfxB3wvjXctgBa7kT1mlqWg4jWrc17uYDMmbhrsENcER1FFhPw4eghfkd8fPoxtmAGD6NM0YlrOsY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1670855270; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=6G/FhsMs5jwK6E4PHv0inxXE9ucTF4RLK2hHJepCAxU=; b=Pi0H7P/JRIpW4Lf0pFSxpyVqUGOasa+LHQi3Su1W/EBBeL9AsMw0MD3EFCoATqCT avSjCHx0EEtvHioBrQzzIpbm9Duiwah5W2d0YBx+XYxeCz8115rMZybWIKXffcay+h3 A8isMPYEPzkdxNhKVheica+1aFXfaU0hyyPzwh5U= Received: from localhost (48-111-142-46.pool.kielnet.net [46.142.111.48]) by mx.zohomail.com with SMTPS id 16708552692911002.7360848962315; Mon, 12 Dec 2022 06:27:49 -0800 (PST) From: Ricardo Wurmus Date: Mon, 12 Dec 2022 15:27:08 +0100 Message-Id: <20221212142716.9460-10-rekado@elephly.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221212142716.9460-1-rekado@elephly.net> References: <87h6y03dkr.fsf@elephly.net> <20221212142716.9460-1-rekado@elephly.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670855353; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=6G/FhsMs5jwK6E4PHv0inxXE9ucTF4RLK2hHJepCAxU=; b=lD03CG5aqOOc7BhoCqtuFqTiFNgmVeD2e1jwB2HYconk3H7AGz/Ymne8pZvoodzUWqcMVB WW2SQwqv5oU13PQA4Sg8dlvrn9/1icdhJXHrLVqaYugqBa1FlYOeOE5vj5g9YZEQAEkMDP OQU7g8m0CBvy7GOgYZ/rqGoGx86v061emFYH9LvWfsYu3GwQLjcDpDVKJrt4KhFbkgiXVY Mlgs8K7KTBvr7b6o2lfpaufBt9evhfdVhQHQhZFkzhg6KNWuvU1wXdrGvOD9gFmuFIyFWs hZd6cnivKRfHOQOCgTUDsCiIHT6jnVTUMe3tbLaUPBpgS7FSC+NOHIDggTgIBg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b="Pi0H7P/J"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none ARC-Seal: i=2; s=key1; d=yhetil.org; t=1670855353; a=rsa-sha256; cv=fail; b=GTbtS09qXRk+pVSaqMo27kGXP05nFSG3LCwZmbb4LYf0kcqhbpaslflBwmKTIz+aHrfD0D tCnFd5DaYydg1E/kshx/3j2slV1986F8sPGYNnkYohJgEFyK8sCqJxgyeEhVyY/vRxjNM5 MNSPjeermE09/neNRaUQTtjHd5FEDXwyQ2RgXael2IOBFEAzH9tIa6VRINi1B5kv2PgQ21 rz5k2ReNGlA1UVe37afHv0f8n4GEdkamnZTl27xy6qPtpH5GDQdjzH2A6MQIZyFl4Nvoa0 J+S3Evh3CV2CPxkQLxaTtFznxYMg87Naahm+qKDyI3fFXInZF6Xnq8T3dVnFaA== X-Migadu-Spam-Score: 3.24 X-Spam-Score: 3.24 X-Migadu-Queue-Id: CCEC0123D2 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b="Pi0H7P/J"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none X-TUID: X7cM9SY2YFUN * gnu/packages/databases.scm (python-apsw): Update to 3.40.0.0. [source]: Remove obsolete patch. [build-system]: Use pyproject-build-system. [native-inputs]: Add python-cython. [arguments]: Move build-extensions phase before build phase. * gnu/local.mk (dist_patch_DATA): Remove patch. * gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch: Remove file. --- gnu/local.mk | 1 - gnu/packages/databases.scm | 36 +++++++++---------- .../python-apsw-3.39.2.1-test-fix.patch | 27 -------------- 3 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6e12f9cdb1..295be3c67c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1719,7 +1719,6 @@ 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 b74762789a..9d1eec5ea0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -173,6 +173,7 @@ (define-module (gnu packages databases) #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system perl) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system ruby) @@ -3590,7 +3591,7 @@ (define-public python-pickleshare (define-public python-apsw (package (name "python-apsw") - (version "3.39.2.1") + (version "3.40.0.0") ;; The compressed release has fetching functionality disabled. (source (origin @@ -3600,24 +3601,23 @@ (define-public python-apsw version "/apsw-" version ".zip")) (sha256 (base32 - "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. + "02sgja00azvd08wi2wm105apmhp2644s7aw9b1zdg3dkcwjnsiad")))) + (build-system pyproject-build-system) + (native-inputs + (list python-cython unzip)) + (inputs (list sqlite-next)) ;SQLite 3.40 required. (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke "python" "setup.py" "build" "--enable-all-extensions" - "--enable=load_extension"))) - (add-after 'build 'build-test-helper - (lambda _ - (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" - "-I." "-Isqlite3" "src/testextension.c")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build" "--enable-all-extensions" + "--enable=load_extension"))) + (add-after 'build 'build-test-helper + (lambda _ + (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext" + "-I." "-Isqlite3" "src/testextension.c")))))) (home-page "https://github.com/rogerbinns/apsw/") (synopsis "Another Python SQLite Wrapper") (description 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 deleted file mode 100644 index cc233e3ccd..0000000000 --- a/gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 -- 2.36.1