From patchwork Fri Apr 18 11:46:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41767 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 DE6E027BC4A; Fri, 18 Apr 2025 14:30:02 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 3CB4727BC49 for ; Fri, 18 Apr 2025 14:30:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kLM-0000uD-Hb; Fri, 18 Apr 2025 07:57:16 -0400 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 1u5kLE-0000tO-SE for guix-patches@gnu.org; Fri, 18 Apr 2025 07:57:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kLC-0000Kv-Q0 for guix-patches@gnu.org; Fri, 18 Apr 2025 07:57:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=UadLhcS9Cuko9bgPTV2VlgtHFrh0ZLGLbaY8Y+OEESU=; b=ZSDfS4+qVlAbh+nOGazBpmMgr/iG0I4D7iT/cazjq5+pQ2K42AfIfCkbHF1ZIkEzGX3++ouerOeaX1VXxA92u/ef4WusdVEDPU7t0tjKWx9mPFiEFI+zoKfcXLLll5Xapwvk6fB60TnOSDX/APJ4o8hhT+Zk6d8EoQH5VxZ9+7Rbs+5ECn5Eh3WFuudR+6NhfYVG1efxfgwuqGAZAiA/CIk63P5/zBq0QgzlNEVnajLsIx7Z+xHEZ2VfNCxjYahoLTBzA1fecfuZP3KEtPcMxISbpa4DMMHM2yWREZLmBsT6/vyLnpA6h46V9GjLnA7uor4hWQMRsn5UU3zp9D2dhA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kL9-0001Fl-7U for guix-patches@gnu.org; Fri, 18 Apr 2025 07:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 1/7] gnu: Add python-lark. References: <20250418095337.339-1-ngraves@ngraves.fr> In-Reply-To: <20250418095337.339-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.17449774074652 (code B ref 77895); Fri, 18 Apr 2025 11:57:03 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:56:47 +0000 Received: from localhost ([127.0.0.1]:50480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kKr-0001Cp-FO for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:56:46 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:53259) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kKg-00019O-HT for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:56:43 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfD56qKz1QcW; Fri, 18 Apr 2025 11:46:44 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:44 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.140.124]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfD35DSzyCd; Fri, 18 Apr 2025 11:46:44 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 183B7C3A03; Fri, 18 Apr 2025 11:46:44 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G002bf946603-711f-4a15-a5bc-613e88f7bdda, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:19 +0200 Message-ID: <20250418114642.2538-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4297559945924436706 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteeffefhfffhjeevleeuvdehgffgveekheeuhfekhfehuefgheffhedugfegleeinecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeejkeelheesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=UadLhcS9Cuko9bgPTV2VlgtHFrh0ZLGLbaY8Y+OEESU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976804; v=1; b=lqdzumqpjwUFrGrybuJzKfSnL+KzHqZ+XtB6jdhSdmME5O/QJBZmsf0VWtAuWRYy66kjNUoY jFqGCI/Jziu5wUmxoZQxfH3B+90Tufohg9dzvu0flP4kQCzn1uIW+TfkM5UqXD8zn6FVcXUbTG2 7xJJBxhqfWANHJ5CLGMvtqtX/4IsC573dGMEuBO5YAt6e4fKCzvFEvU7soAkBRQK+NLx0se7AC5 4i1P2V+PUOe02AbnOkKnFXIh4ubvXolngJfgVDjO1ljH9Jifg1R+L1pJpWnWMXU02djqAuxwnTV qgAjVNjqXsHCvqCyyRVwyMHLG59ZBG0NYay59KQoGJxUw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-lark): New variable. (python-lark-parser): Inherit from python-lark and update to 0.12.0. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fd797ff2c0..f9b98d7dd5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23655,17 +23655,18 @@ (define-public python-pyproject-hooks write tooling that generates distribution files from Python projects.") (license license:expat))) -(define-public python-lark-parser +(define-public python-lark (package - (name "python-lark-parser") - (version "0.9.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "lark-parser" version)) - (sha256 - (base32 - "1kd61asrb3h9spgsj4bslfbgp8q4271sw3hblk6f2vbbblv8jxcy")))) - (build-system python-build-system) + (name "python-lark") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lark" version)) + (sha256 + (base32 "107d1w24b3ln4zwsw4yvkfhff6bk5n3cpvlgbbqww5ndc80pv06a")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools python-wheel)) (home-page "https://github.com/lark-parser/lark") (synopsis "Multi-language parser for Python") (description @@ -23675,6 +23676,18 @@ (define-public python-lark-parser some degree most natural languages too.") (license license:expat))) +;; XXX: lark was renamed from lark_parser with major release 1 +(define-public python-lark-parser + (package/inherit python-lark + (name "python-lark-parser") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "lark-parser" version)) + (sha256 + (base32 + "0f51jr7dvnd3rm7j5nkkgm2vxfa7a1s804avlvf16h11y6qpv5hm")))))) + (define-public python-find-libpython (package (name "python-find-libpython") From patchwork Fri Apr 18 11:46:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41762 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 B36A627BC4A; Fri, 18 Apr 2025 12:49:13 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 80B7227BC49 for ; Fri, 18 Apr 2025 12:49:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCY-0006o4-R7; Fri, 18 Apr 2025 07:48:10 -0400 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 1u5kCX-0006nU-1I for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kCW-0007c0-EO for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3fmgTwrlRQt0lvUSmcTnq9iVp8dICq8Hb8aj4xj064w=; b=Y7U6GXYtCFtCTwNlmtRUTghqVpfwvqbTNykmXibDkTUY9svI8gGd9cXSmWHRQQQSUDCSDH5lHvOi33zkBZCp3iwEXKf89QvsvdueWFQq5hTc4D1YO+VzrNmOmTmY5si2SDHvlsdVTNJU/rsKKVa1Fv/b0e7o56uf2jHDbpMlQEB/SKAh88/yyn4TjltCH/R9IGs4iEs2QhzuOcIb7o9hntEyS+RP+RKTsJt9HYr6FA3wurAOQXaeSipO5eYgda6/1G0RNYAF5DL+WPWg3lMRbgL4p1umdNeAJNtdPBccbZJkm2UgcSt6NMZFAYTuMj9oyb4ei5khM2N22ct0Yfl3Nw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCW-0007vW-3s for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 2/7] gnu: python-suds: Fix dist-info. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174497684329973 (code B ref 77895); Fri, 18 Apr 2025 11:48:07 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:47:23 +0000 Received: from localhost ([127.0.0.1]:50446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kBk-0007mv-1g for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:22 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:54689) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBK-0007gD-7A for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:01 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfF4sGKz1ckS; Fri, 18 Apr 2025 11:46:45 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:45 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.47]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfF2wGYzHmRj; Fri, 18 Apr 2025 11:46:45 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id DCDCFC3A03; Fri, 18 Apr 2025 11:46:44 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-95G001d45a2ff9-7068-4926-9fe6-3d4e4822e908, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:20 +0200 Message-ID: <20250418114642.2538-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4297841420008612578 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=3fmgTwrlRQt0lvUSmcTnq9iVp8dICq8Hb8aj4xj064w=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976805; v=1; b=RStrFW39GDhIWpYIwXPqyaEdFzvQxfF2wP5NLngoSIiW/w4n9rqrZybjd4mx6zrRfrCX/mkf Qo5hxaotmS73pPD9miKr+/92BiYVn3DpfhaD9TsSBpf+/OFUtpVhmPLcRtUYH/LxQJ5SVF2OqIF ruumtrbw2N6N95+yK34PZwLGMpRbIYELDHu10Fu9JRGALM3CNQw/WYFQuuBq0Om/BRFi3hWNMW3 R3MTful7K8GeLZzJ9iBJvMo642bVJn1UrO/l4RJ1LcmcwCifPlfuit33LIiD7eZvUFKuQ/byUhr p++uaGbX+zFIfsaFbyI5pf+gkBjJqUecgYy1ti+URyF8w== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-web.scm (python-suds) [arguments]{phases}: Add phase 'add-custom-dist-info. --- gnu/packages/python-web.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e05ac25563..722568fee6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -10592,6 +10592,22 @@ (define-public python-suds (sha256 (base32 "1byyg7b2ixpr8hc849a6dd0qn5daxqawz6lb3php8lrmsb1n5cc3")))) (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; XXX: chirp expects suds instead of suds_community + (add-after 'install 'add-custom-dist-info + (lambda _ + (for-each + (lambda (dir) + (with-directory-excursion (dirname dir) + (symlink + (basename dir) + (string-append "suds-" #$version ".dist-info")))) + (find-files #$output + (lambda (file stat) + (string-suffix? ".dist-info" file)) + #:directories? #t))))))) (native-inputs (list python-pytest python-setuptools From patchwork Fri Apr 18 11:46:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41763 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 5CC4927BC4B; Fri, 18 Apr 2025 12:49:13 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 5E9FD27BC4C for ; Fri, 18 Apr 2025 12:49:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCY-0006nd-F3; Fri, 18 Apr 2025 07:48:10 -0400 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 1u5kCT-0006nC-Ne for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kCT-0007ba-7W for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KuuNIeOLzBd5/ILZolhn0rYCn+78VsoM1KqXYPTt+5Q=; b=pgEWkdJckNggLgPZ3MDVnM7WtAa7PyJWWxbAExhNDpNKGBcT7IQ8D5ia0LODls+pGKXjc+gENMQv8ZJgnnuO0b9Be8Q9ArOXdfknt93/UrxDeGv8H1XmfEvxQszcHNNuDe7LDlQu4wW8ybpLmYzTRhvl7Rh6Cht0xeDzDjwg73bLTDnt5SD9FNpkNbeWr8C/gZgyJssqPOfJJuMTBY6OGdkF+leLVa2Qv3NErzLv2vTh3gRufRo8AYClytWoPedkwItHRBEDDYczuouv1MgNp7TETLWRRRARZs6B/mxg8yyvx7YvtZEn1NSaYVkT1E7MfSGc47aXm7FaB7bwyvn7qQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCS-0007ut-Qg for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 3/7] gnu: chirp: Update to 0.4.0-4.bc27f66. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174497682829808 (code B ref 77895); Fri, 18 Apr 2025 11:48:04 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:47:08 +0000 Received: from localhost ([127.0.0.1]:50442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kBU-0007jk-9d for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:07 -0400 Received: from 10.mo563.mail-out.ovh.net ([46.105.78.6]:34537) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBJ-0007gh-8l for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:00 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfG6mp2z1Jn6; Fri, 18 Apr 2025 11:46:46 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:46 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.140.124]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfG54R9zHmRj; Fri, 18 Apr 2025 11:46:46 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 1D6F3C3A03; Fri, 18 Apr 2025 11:46:46 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S005074245b8-42ae-4b1e-b350-f3ab5e2b7447, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:21 +0200 Message-ID: <20250418114642.2538-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4298122897708016354 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=KuuNIeOLzBd5/ILZolhn0rYCn+78VsoM1KqXYPTt+5Q=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976807; v=1; b=z1/Nd7gPRS6KWDu13gkZVuISewdLSrvfZQg5J+0i1xZhKBEBEdRW4wDD0u1reRZd3Ji559yb 1a7UFeVLG/fHB7pmyjDWJ2Fb5Sv1LQTMHjseBXnina8ZB5O9E2itOnYaup3ra0pSQxfsbtDIHtz IY2pfBPag8wbYWi6xMi91axrtDaXB5CyFH8ypfGsxmHzNqpBrANIqoz9ZqxJx+S+/EC5aW+iH69 tBO26W06EqSd5JV37IMHnumO1obl4+lic+VG0/TN80DPKCXXcLEkRTD0bwK4kfBmsDlpAEp/ynM Vj5bdl/xgE0TCrvq3H/enAyXUtHa9XgOZNLpsK+lFAyUw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/radio.scm (chirp): Update to 0.4.0-4.bc27f66. [build-system]: Switch to pyproject. [native-inputs]: Remove python-mox3, python-tox. Add python-setuptools, python-wheel. [inputs]: Replace python-lark-parser by python-lark. Remove python-six. [arguments]{test-flags}: Ignore failing tests. --- gnu/packages/radio.scm | 44 ++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 2752380a3a..6d7274ef0a 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -3254,8 +3254,8 @@ (define-public satdump (license license:gpl3))) (define-public chirp - (let ((commit "1219bee0d39ca3778acdf5d7f0a92c1e8208bae9") - (revision "3")) + (let ((commit "bc27f6653aa804a5c55a3a1b2244ee43a174854b") + (revision "4")) (package (name "chirp") (version (git-version "0.4.0" revision commit)) @@ -3267,35 +3267,45 @@ (define-public chirp (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "19z3f05zppg8w4z4sdich8d173sd87501l0p8l1vn1awgky2q0r8")))) - (build-system python-build-system) + (base32 "15nly5j0f3h67pv6li6vrd56wmdnplanls867kf60r9vz0k4k0yd")))) + (build-system pyproject-build-system) (native-inputs (list python-mock - python-mox3 python-pytest python-pytest-mock python-pyyaml - python-tox)) + python-setuptools + python-wheel)) (inputs (list python-future python-importlib-resources - python-lark-parser + python-lark python-pyserial python-requests - python-six python-suds python-wxpython python-yattag)) (arguments - (list ;; FIXME: How to run the tests? The default way crashes. - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; FIXME: Why does sanity-check phase fail to find lark? - (delete 'sanity-check) - (add-after 'build 'set-home-for-tests - (lambda _ - (setenv "HOME" "/tmp")))))) + (list + #:test-flags + #~(list ;; FIXME: These files error during collection. + "--ignore=tests/unit/test_csv.py" + "--ignore=tests/unit/test_wxui_radiothread.py" + ;; These tests are long and expensive. + "--ignore=tests/test_drivers.py" + ;; Ignore tests requiring network. + "-m" "not network" + "-k" (string-append + ;; XXX: Tests likewise prefixed all have a RADIO_CLASS=None + "not TestCase" + " and not test_bitwise_errors" + ;; XXX: Requires settings TLS certificates. + " and not test_marc_works")) + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'set-home-for-tests + (lambda _ + (setenv "HOME" "/tmp")))))) (synopsis "Cross-radio programming tool") (description "Chirp is a cross-radio programming tool. It supports a growing list of radios across several manufacturers and allows transferring of From patchwork Fri Apr 18 11:46:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41766 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 24E3227BC4A; Fri, 18 Apr 2025 12:50:17 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 A316C27BC49 for ; Fri, 18 Apr 2025 12:50:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCe-0006qZ-Oz; Fri, 18 Apr 2025 07:48:16 -0400 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 1u5kCc-0006pj-Sd for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:14 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kCc-0007ci-Gh for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3BIqqQO4SrY1v08bJQYKwqQkLdkWsr+L2KRGD4BwHvM=; b=rsgFLhQNbqThG5GL+jz4Pi5zdk5IPrYp6FRwWYILqQbvEoQQGMVJnoR3zfjL+TeNnw4/SmHYFw0FuHTZ9EzkGp7m2d6a+eyrsYY8fA5nWPkfOo2xMv3i5A2qERg9vgu7FibiQXuJ3e4lGIUhqgoVqZoOe2zVNTDFJzEkO3XuYEHvsHomTbj8w0gh6rhBF3+KG9NDRg5B9ZXSS7sHYlSDjL6mUewjRApjM7ROxrCe+xpRdxW3D9WZIgv8LcYCMI5UKCvKUqEvMEc3Phjnf1XAdSshlvhq2XhE/9jQj+TGc1coQrTYTRqWh1acapT6A6hMrHCkR/vpObzD+9OZDJMWEA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCc-0007wr-8u for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 4/7] gnu: Remove python-mox3. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174497688430421 (code B ref 77895); Fri, 18 Apr 2025 11:48:14 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:48:04 +0000 Received: from localhost ([127.0.0.1]:50454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kCN-0007to-Re for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:48:03 -0400 Received: from 5.mo563.mail-out.ovh.net ([46.105.53.64]:56005) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBX-0007ji-Q7 for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:13 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfJ09ztz1PgR; Fri, 18 Apr 2025 11:46:48 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:47 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.103]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfH6hK7zy7P; Fri, 18 Apr 2025 11:46:47 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 47D71DA3A04; Fri, 18 Apr 2025 11:46:47 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S0016e062038-5cb2-4103-9cb6-3b2183b7de51, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:22 +0200 Message-ID: <20250418114642.2538-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4298404371342353122 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepjeevfedvheevgfdtieeuudelueduveefheeglefffefgieeuffetfeefvdeltdejnecuffhomhgrihhnpehophgvnhhsthgrtghkrdhorhhgpdhgohhoghhlvgdrtghomhdpphihthhhohhnrdhorhhgpdhlrghunhgthhhprggurdhnvghtnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=3BIqqQO4SrY1v08bJQYKwqQkLdkWsr+L2KRGD4BwHvM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976808; v=1; b=cwuVdnlZpHxx+hutOXPPHSmEMWPct8KsqaIbyLEiFRbvncq7PqiXgYOuD/KpQK6Z3yQrjr8A ICw9+Lwyp79gYrEHGsu48xumexbr6RGaX3iPiOk0Hy8i60dzp+UX8PY/5/siKjFjXJiYv5tb6u2 mVBRB+ArttY8I48h1i4eS43tf06AcML++CFcMy4e8n5M1v+vcqR6MdNzI0Wp0PPUpqKzKJUgBmh mieK63jAnYziIXY2uOniVg4Omk30KfoIBQDg+jLZpko4dgAtlCtBem7jT/phTdmV5L+nNYB9nSN /zmigDxU1/13h8tJbt3CobtB+UE04xbXn+XS1dLEGz/sQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This python library is now a leaf package undevelopped for 5 years and not failing on the latest python version. * gnu/packages/openstack.scm (python-mox3): Remove variable. * gnu/packages/patches/python-mox3-python3.6-compat.patch: Remove patch. * gnu/local.mk: Deregister patch. --- gnu/local.mk | 1 - gnu/packages/openstack.scm | 26 ----------- .../python-mox3-python3.6-compat.patch | 43 ------------------- 3 files changed, 70 deletions(-) delete mode 100644 gnu/packages/patches/python-mox3-python3.6-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index d4b2d4ad51..7bdc9baa3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2127,7 +2127,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ - %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python-property-cached-asyncio-3_11.patch \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index e78a1f614f..eab255464d 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -181,32 +181,6 @@ (define-public python-hacking guidelines}.") (license asl2.0))) -(define-public python-mox3 - (package - (name "python-mox3") - (version "0.24.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mox3" version)) - (patches (search-patches "python-mox3-python3.6-compat.patch")) - (sha256 - (base32 - "0w58adwv7q9wzvmq9mlrk2asfk73myq9fpwy7mjkzsz3baa95zf5")))) - (build-system python-build-system) - (propagated-inputs - (list python-fixtures python-pbr)) - (native-inputs - (list python-openstackdocstheme python-sphinx python-subunit - python-testrepository python-testtools)) - (home-page "https://www.openstack.org/") - (synopsis "Mock object framework for Python") - (description - "Mox3 is an unofficial port of the @uref{https://code.google.com/p/pymox/, -Google mox framework} to Python 3. It was meant to be as compatible -with mox as possible, but small enhancements have been made.") - (license asl2.0))) - (define-public python-openstackdocstheme (package (name "python-openstackdocstheme") diff --git a/gnu/packages/patches/python-mox3-python3.6-compat.patch b/gnu/packages/patches/python-mox3-python3.6-compat.patch deleted file mode 100644 index 0426d07cf9..0000000000 --- a/gnu/packages/patches/python-mox3-python3.6-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix regex so that it works with Python 3.6. - -See . - -Copied from upstream bug report: -https://bugs.launchpad.net/python-mox3/+bug/1665266 - -From 05064cdb6ea7a16450c6beae2b6f7c6074212a69 Mon Sep 17 00:00:00 2001 -From: Zac Medico -Date: Thu, 16 Feb 2017 00:24:10 -0800 -Subject: [PATCH] RegexTest: python3.6 compatibility - -These fixes are backward-compatible with older python versions: - -* raw strings fix invalid escape sequences -* flags=8 fixes ValueError: cannot use LOCALE flag with a str pattern ---- - mox3/tests/test_mox.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mox3/tests/test_mox.py b/mox3/tests/test_mox.py -index 15ac565..3a1af17 100644 ---- a/mox3/tests/test_mox.py -+++ b/mox3/tests/test_mox.py -@@ -312,12 +312,12 @@ class RegexTest(testtools.TestCase): - def testReprWithoutFlags(self): - """repr should return the regular expression pattern.""" - self.assertTrue( -- repr(mox.Regex(r"a\s+b")) == "") -+ repr(mox.Regex(r"a\s+b")) == r"") - - def testReprWithFlags(self): - """repr should return the regular expression pattern and flags.""" -- self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) == -- "") -+ self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) == -+ r"") - - - class IsTest(testtools.TestCase): --- -2.10.2 - From patchwork Fri Apr 18 11:46:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41764 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 0448527BC4A; Fri, 18 Apr 2025 12:49:47 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7CB8227BC49 for ; Fri, 18 Apr 2025 12:49:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCe-0006qV-9n; Fri, 18 Apr 2025 07:48:16 -0400 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 1u5kCb-0006p3-DV for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kCb-0007cW-2y for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=TgnoM8JEfYGtdPzjEGBhvi7fYVu4EcLLuX7sus5PWBI=; b=skbWMx0VeRNMMPpGpZ3ok/Pf8VNNzX15Lpqxjsle942nVrCsEaFWXujSs+/HSKWt2wGUSKjHcV/wpuxxG//+gvblv53RN7d1E7dxNrx+wvo+GNTXCABujyuMyqRYl3vqVfo1zhdoYuGJt+2dYLZkf43bT018AbA7TuNoD5WiXuJKx/YcjJ7NhL1VdENDnIKBDB32ewLpHar5+GmmnYSvIXnt2lcWB5yV59wNx9vZQdEKtv3fgT/+HzzMg7W0V08jdF73S4MiT4aseqwVLH7PICfSse3jLE+YNqphaI9Nk32HiHd+zdny0h7ZYRCzfoZSJNbTtwuM2bhcdm6jnAbjaA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCa-0007wV-RY for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 5/7] gnu: python-skranger: Improve phase 'build-extensions. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174497688030372 (code B ref 77895); Fri, 18 Apr 2025 11:48:12 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:48:00 +0000 Received: from localhost ([127.0.0.1]:50452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kCL-0007tV-Cu for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:59 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:60113) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBR-0007i8-IL for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:07 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfK0MCkz1c5Z; Fri, 18 Apr 2025 11:46:49 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:48 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.47]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfJ6dtjzyBv; Fri, 18 Apr 2025 11:46:48 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 817262639F4; Fri, 18 Apr 2025 11:46:48 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S00402a5792c-6abf-4e80-ba62-064eb56d45a0, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:23 +0200 Message-ID: <20250418114642.2538-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4298685844419896034 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=TgnoM8JEfYGtdPzjEGBhvi7fYVu4EcLLuX7sus5PWBI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976809; v=1; b=SWHt42q0fdFvftKJpUrMT0rjJSkaynmTLeAuJ5uAKd/Ya4B996KpWhIiYGvA5eTnSzSvb2Mk /eSlIpLnv0ZFdyQI2q0zMzav6YWtmofs4r+lLoiZusnqqgkRHJ/9xdN3BaZqtwZp1nxEfCpxvIw dPqTSbLg/Oy1EWHUUTNi8W7Qi6irT1MixCsfPSfxyuE/8zs4xo+gZ4PzzkO1qn/XDXRh4MfMsPx VPWLkGij5fxIlVm6sk5YU3tNh5grBT+TtRbNYgdY30iBM028GHD4G1DRqvfYjzqwN9Or6e67d+J 6vfxCDoA9HfrkaZ5sDY/p63l04PKM26Nj5jswexihTIsw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-skranger) [arguments]{phases}: Improve phase 'build-extensions with site-packages procedure. --- gnu/packages/python-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f9b98d7dd5..14a95de25d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2605,14 +2605,12 @@ (define-public python-skranger (("from sklearn.datasets import load_boston") "") (("^_boston_X.*") "_boston_X, _boston_Y = (True, True)\n")))) (add-before 'check 'build-extensions - (lambda _ + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Cython extensions have to be built before running the tests. (invoke "python" "buildpre.py") (invoke "python" "build.py" "build_ext" "--inplace") - (let ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages/skranger")) + (let ((site (string-append (site-packages inputs outputs) + "/skranger")) (lib (match (find-files "build" "\\.so") ((the-lib) the-lib) (_ (error "could not find .so"))))) From patchwork Fri Apr 18 11:46:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41761 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 405FB27BC4A; Fri, 18 Apr 2025 12:49:13 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 544D827BC4B for ; Fri, 18 Apr 2025 12:49:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCb-0006oz-1s; Fri, 18 Apr 2025 07:48:13 -0400 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 1u5kCZ-0006oL-93 for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:11 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kCY-0007cC-Q7 for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RSxJW3ITmoFvccy/rMrtTawzQyf6xxzl1iGP7VU3otU=; b=jnaJN6NH3F5OqH667PkSz0gGIQ109AiSNeABot/658H3h1Km5ayE9l4Qu28jJPxx3f3LMsnubVv8nszqOYKYkZhHG1gYZUL5u7fGxBZGJA8qg3vOqIFhPlBKRKi23nATcjMFJWAaYslMdcjt9t7S8CUcAbA1hPyxcu1oAbyZpChl2jvdJJCO5uRPC3hWB8SydJg1OflVIwAxBubgkeZ/UPGvpJTQHSZBA8SK069eDfz+1EGxykFG5RvJ507VZRm3s68LaICIxYN8k6iDZF0d1PGuR3exc7StR9wx4cQcjhl2RA7QeexDThtU1Wcl5nxCf5O0IQnYwwbe530Pw3+7wg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCY-0007vy-I8 for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 6/7] gnu: python-bed-reader: Improve phases' style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174497684630007 (code B ref 77895); Fri, 18 Apr 2025 11:48:10 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:47:26 +0000 Received: from localhost ([127.0.0.1]:50448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kBm-0007nT-Qc for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:25 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:39257) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBO-0007hJ-JI for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:05 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfL1yLCz1chp; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.36]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfK6xJyzHcF2; Fri, 18 Apr 2025 11:46:49 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.1]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7E921D43D36; Fri, 18 Apr 2025 11:46:49 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R0056913c5b4-723f-4db3-82d3-20e42473d739, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:24 +0200 Message-ID: <20250418114642.2538-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4299248798399193826 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=RSxJW3ITmoFvccy/rMrtTawzQyf6xxzl1iGP7VU3otU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976810; v=1; b=OaBluLmgYwIVKD+H0hBQ/XUKfkzy66XLeZ8qPJuUgazIOAmRAX3DLgu/G3Nz8X2R68a1pBRC 5ZigFU56oszqi8kB6M2DBLoGAsaKd1WQdJ304roluEePxdcVFf4l2wD9uh38iwGrDG9Fy5LZCct gXAGiR8BokW2PT7974Mttv2VtFOuJ3cClNalwdwGRYI0IK22wnVXdutNw98E/y3PgYsgxOfvn5p b88tUwPFGfCE+dp8BDrdUdM9IcE9TfkaVCRtYfg9UrJ8tPcIdYsmwVUGYqjNeNdUTziUy1nUOYi F3BepkiGXLBJgzPSNk5C99UEibGNGqSOXdlXG4F1LXjmQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bioinformatics.scm (python-bed-reader) [arguments]{phases}: Improve phases 'install-python-library and 'check-python with site-packages procedure. --- gnu/packages/bioinformatics.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e1cac1f149..d4fa482851 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2333,26 +2333,20 @@ (define-public python-bed-reader (add-after 'build-python-module 'install-python-module (assoc-ref py:%standard-phases 'install)) (add-after 'install-python-module 'install-python-library - (lambda _ - (let ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages/"))) - (mkdir-p (string-append site "bed_reader")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((site (py:site-packages inputs outputs))) + (mkdir-p (string-append site "/bed_reader")) (copy-file "target/release/libbed_reader.so" - (string-append site "bed_reader/bed_reader.so"))))) + (string-append site "/bed_reader/bed_reader.so"))))) (add-after 'install-python-library 'add-install-to-pythonpath (assoc-ref py:%standard-phases 'add-install-to-pythonpath)) (add-after 'add-install-to-pythonpath 'check-python - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? - (let ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages/")) + (let ((site (py:site-packages inputs outputs)) (data-dir "bed_reader/tests/data")) (symlink (canonicalize-path data-dir) - (string-append site data-dir)) + (string-append site "/" data-dir)) (invoke "pytest" "-v" #$output ;; These test require a 84 GB file. "-k" (string-join @@ -2363,7 +2357,7 @@ (define-public python-bed-reader "test_optional_dependencies") " and not ")) (delete-file-recursively - (string-append site "bed_reader/tests")) + (string-append site "/bed_reader/tests")) (delete-file-recursively (string-append #$output "/.pytest_cache"))))))))) (native-inputs (list python-pytest From patchwork Fri Apr 18 11:46:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41765 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 14A0927BC4A; Fri, 18 Apr 2025 12:49:48 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 727A927BC49 for ; Fri, 18 Apr 2025 12:49:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5kCc-0006ph-AW; Fri, 18 Apr 2025 07:48:14 -0400 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 1u5kCa-0006of-MJ for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5kCa-0007cO-Bw for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=u2Bv2lqDjZcdv655wFAteF4ItiF8wJCGvx1rNMwVTSs=; b=utkb50pZCtrNhbGG39idZ8QJ5TgWYzY+/ujPawvwdANS+rdF0bhvk2lre6Oms+1hCOkwiJZ/6exFn+qrgJ5jwvU6ONdUsab5c1fCvjrV5zzflasM/opcDFycjGfBSE5x/fut7VW12uC39VypiCV6Wtl5zOyGJ6qk+Yv1ZHluvisGgLzUisKzOiaTMYYO5msM8eUsMaOuMAGWyL+VvhlIvUXdlIU87CwouxujICPQvhtK+rsYBlAFrgEnz4KQPyQ5mxu8ulvtLduqOYTs8yzVSNpjdwA+adpL2a3sU0mErI+H1A0PvfACgZUSBpCN1H5InZ5v7vF+fvXRgvkjyOEEpQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5kCa-0007wJ-5l for guix-patches@gnu.org; Fri, 18 Apr 2025 07:48:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77895] [PATCH 7/7] gnu: gitless: Fix build and disable failing tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 11:48:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77895@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77895-submit@debbugs.gnu.org id=B77895.174497686730241 (code B ref 77895); Fri, 18 Apr 2025 11:48:12 +0000 Received: (at 77895) by debbugs.gnu.org; 18 Apr 2025 11:47:47 +0000 Received: from localhost ([127.0.0.1]:50450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5kC9-0007rK-3z for submit@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:47 -0400 Received: from 3.mo563.mail-out.ovh.net ([46.105.40.8]:46309) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5kBR-0007hC-Qj for 77895@debbugs.gnu.org; Fri, 18 Apr 2025 07:47:06 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfL71rkz1R25; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77895@debbugs.gnu.org>; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.118.55]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZfCfL68mtzyF8; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7644CDA3A06; Fri, 18 Apr 2025 11:46:50 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-103G005f2a35fb1-a13f-41b6-8634-86661f915a95, 87B5F7520F1C12C50596DB6AAE10C577A8A8D40E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 18 Apr 2025 13:46:25 +0200 Message-ID: <20250418114642.2538-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418114642.2538-1-ngraves@ngraves.fr> References: <20250418114642.2538-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4299248797975634658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvfedvtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeekleehseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=u2Bv2lqDjZcdv655wFAteF4ItiF8wJCGvx1rNMwVTSs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1744976811; v=1; b=3Quql5ki/nGwbhnNHBjHVIkZ9VLHA6TKZ57/mDi+mQ6l7odVVGtahTl8dRgqOH3EyoUvl9wm 4inwNkjNNROrWpFa+ZpH5YoNjNcScAMPfKUsHAa4jVQcre+6VRg8isskHoTr+iYgI05URw1ntQY yBMmx42m2KnkFZaq5haDza7bYMgQNPldgJTzUwZ4g9R7g9Ne2ETlkXvD6V9mmR3uqinX655+EVR wF+RVw3i21+9XjC4XimUYqKHVB3DTQEEnMLLP0g/RWvTQE0SIL/ZKTfvJhehqv31YYkfGECFr7/ s4KvT/THBa1aWKdD7OWLzvNG7WfIUS8pTwM7tXOy8rNEg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (gitless) [build-system]: Switch to pyproject-build-system. [arguments]{test-flags}: Disable failing tests. {phases}: Improve git configuration in phase 'prepare-for-tests. Improve style of 'wrap phase. [native-inputs]: Add python-pytest, python-setuptools, python-wheel. --- gnu/packages/version-control.scm | 35 ++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8d6709f7f6..d9e7dd249f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -940,9 +940,21 @@ (define-public gitless (sha256 (base32 "048kl27zjr68hgs70g3l98ci9765wxva6azzrhcdys7nsdd493n6")) (file-name (git-file-name name version)))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list + ;; XXX: Unclear why these tests fail. + #:test-flags + #~(list "-k" + (string-append "not test_exclude_one" + " and not test_exclude_some" + " and not test_ip_commit" + " and not test_only_one" + " and not test_only_some" + " and not test_basic_functionality" + " and not test_conflicts" + " and not test_conflicts_switch" + " and not test_nothing_to_fuse")) #:phases #~(modify-phases %standard-phases (add-before 'build 'loosen-requirements @@ -959,20 +971,21 @@ (define-public gitless ;; The tests try to run git as if it were already set up. (setenv "HOME" (getcwd)) (invoke "git" "config" "--global" "user.email" "git@example.com") - (invoke "git" "config" "--global" "user.name" "Guix"))) + (invoke "git" "config" "--global" "user.name" "Guix") + (invoke "git" "config" "--global" "color.ui" "true"))) (replace 'wrap - (lambda* (#:key inputs #:allow-other-keys) - (let ((out #$output) - (git (search-input-file inputs "bin/git"))) - (wrap-program (string-append out "/bin/gl") + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((git (search-input-file inputs "bin/git"))) + (wrap-program (string-append #$output "/bin/gl") `("PATH" ":" prefix (,(dirname git))) `("GUIX_PYTHONPATH" ":" = - (,(string-append out "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages:") + (,(string-append (site-packages inputs outputs) ":") ,(getenv "GUIX_PYTHONPATH")))))))))) - (native-inputs (list git-minimal)) + (native-inputs + (list git-minimal + python-pytest + python-setuptools + python-wheel)) (inputs (list bash-minimal git-minimal