From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 08:02:58 2025 Received: (at submit) by debbugs.gnu.org; 22 Apr 2025 12:02:59 +0000 Received: from localhost ([127.0.0.1]:46601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7CL4-0007DV-Gz for submit@debbugs.gnu.org; Tue, 22 Apr 2025 08:02:58 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52894) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7CKx-0007DA-VT for submit@debbugs.gnu.org; Tue, 22 Apr 2025 08:02:56 -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 1u7CKs-00076m-1R for guix-patches@gnu.org; Tue, 22 Apr 2025 08:02:46 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7CKp-0002G6-D5 for guix-patches@gnu.org; Tue, 22 Apr 2025 08:02:45 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4Zhgpk745zz1YTZ; Tue, 22 Apr 2025 12:02:38 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for ; Tue, 22 Apr 2025 12:02:38 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.171]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4Zhgpk59xQz7wVr; Tue, 22 Apr 2025 12:02:38 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 38C2FDA3A2F; Tue, 22 Apr 2025 12:02:38 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-112S006ad02ba5d-6bc6-4357-b765-6f266b1a9687, 0A1BC1951B487096A19EF2AF6351B65704E5605C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH 0/2] Update and fix python-omero-py. Date: Tue, 22 Apr 2025 14:02:01 +0200 Message-ID: <20250422120236.3877-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 9610118655749579490 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvgeefieekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=rS4XYCns4y05I7qtknpsWCUDVFvtxv4dvYY0enA1+PE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745323359; v=1; b=2aS4EbT8fh8LAeoT9k92RwZwh5PVovrTe8OMQhH9MQwJH/vSzm/B1JRCHBK14E3wZGItau5I YwcSuErprY5GumeIs22y9YtxdMbDqkWZ71kiXpb3PcGr4QbAVhvAo5FfIy7nFJgQSAK8lS5TnKa QY6C6qlYt9c7AkKKXqdy/m7LWbh4JgBgXHbz8H+EQPORu1vPyUA7O/XiTACtKiVtf/a1t86bhSZ A/uYveF6SDn7llSuG6Mbmgdg4Pi5672AV21qzSZRuDgr50bwZADydFKsTeJs47Z7WYo2Mhw8UAp CTnPFnGVSWbg8LT6RlvpVI7vXMY495j2tR+KDAONOuyEA== Received-SPF: permerror client-ip=46.105.48.192; envelope-from=ngraves@ngraves.fr; helo=5.mo562.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Nicolas Graves (2): gnu: python-zeroc-ice-3.6: Fix build with Python@3.11. gnu: python-omero-py: Update to 5.20.0. ...-zeroc-ice-3.6.5-python-3.11-support.patch | 33 ++++ gnu/packages/python-xyz.scm | 173 ++++++++++-------- 2 files changed, 128 insertions(+), 78 deletions(-) create mode 100644 gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 08:04:21 2025 Received: (at 77986) by debbugs.gnu.org; 22 Apr 2025 12:04:21 +0000 Received: from localhost ([127.0.0.1]:46609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7CMO-0007Gg-Gy for submit@debbugs.gnu.org; Tue, 22 Apr 2025 08:04:20 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:52755) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7CMK-0007GM-RG for 77986@debbugs.gnu.org; Tue, 22 Apr 2025 08:04:18 -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 4Zhgrb09zXz1PQL; Tue, 22 Apr 2025 12:04:14 +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 <77986@debbugs.gnu.org>; Tue, 22 Apr 2025 12:04:14 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.213]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZhgrZ4dCQzyGF; Tue, 22 Apr 2025 12:04:14 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E9BE0D43E1E; Tue, 22 Apr 2025 12:04:13 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S0051b277495-ba20-440c-820d-00fe1e89ec3f, 0A1BC1951B487096A19EF2AF6351B65704E5605C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: 77986@debbugs.gnu.org Subject: [PATCH 1/2] gnu: python-zeroc-ice-3.6: Fix build with Python@3.11. Date: Tue, 22 Apr 2025 14:04:03 +0200 Message-ID: <20250422120409.4287-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 9637140253141623522 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvgeefieekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeelkeeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=hteh6ftdy2EMVxHYYr7f6YYSn3Y2lgEIK+6/7tQUwE8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745323455; v=1; b=pjNOfoAnJYhoLtPPKd64L5CXE1VWEhfL2J6X32uQRU+6El50lz2UuWC9oR+fingBLNZoQoVD 6vryE1bGkPt7opkvpU37+F4O3fyWPM+Clb+e0fGs2ntccGuXA83/MiTDcAnfCZYRw9WzkhSS+i8 U0CRmkAeOUHXb5FOOsdsEHQkqbPfxiBlGkkLtzMeGb+n70/j/tC6000vKpjSRhnPNePjbcafHbo TDzstLkRDrNB5Ub+rGZoHglsiKpvpjYHNzsiw9MWFL9Ufp1fQOf0e0bKIJTjLAtHiLlzGtn0UHT n6qGnHQa53cjy9yRscFp084G8AJQuWdZaep78sc/bs5uQ== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77986 Cc: Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/python-xyz.scm (python-zeroc-ice-3.6) [source]: Add patch. * gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch: Add patch. --- ...-zeroc-ice-3.6.5-python-3.11-support.patch | 33 +++++++++++++++++++ gnu/packages/python-xyz.scm | 5 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch diff --git a/gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch b/gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch new file mode 100644 index 00000000000..17cae7297c0 --- /dev/null +++ b/gnu/packages/patches/python-zeroc-ice-3.6.5-python-3.11-support.patch @@ -0,0 +1,33 @@ +Only in zeroc-ice-3.6.5: setup.py.orig +diff --color -ur zeroc-ice-3.6.5.orig/src/Slice.cpp zeroc-ice-3.6.5/src/Slice.cpp +--- zeroc-ice-3.6.5.orig/src/Slice.cpp 2019-07-31 21:49:38.000000000 +0200 ++++ zeroc-ice-3.6.5/src/Slice.cpp 2023-10-12 10:52:07.029069937 +0200 +@@ -17,12 +17,6 @@ + #include + #include + +-// +-// Python headers needed for PyEval_EvalCode. +-// +-#include +-#include +- + using namespace std; + using namespace IcePy; + using namespace Slice; +diff --color -ur zeroc-ice-3.6.5.orig/src/Util.cpp zeroc-ice-3.6.5/src/Util.cpp +--- zeroc-ice-3.6.5.orig/src/Util.cpp 2019-07-31 21:49:38.000000000 +0200 ++++ zeroc-ice-3.6.5/src/Util.cpp 2023-10-12 10:49:15.033366926 +0200 +@@ -214,7 +214,12 @@ + // + // Get name of current function. + // ++ // Use PyEval_GetFrame with Pyhthon >= 3.11 ++#if PY_VERSION_HEX >= 0x030B0000 ++ PyFrameObject *f = PyEval_GetFrame(); ++#else + PyFrameObject *f = PyThreadState_GET()->frame; ++#endif + PyObjectHandle code = PyObject_GetAttrString(reinterpret_cast(f), STRCAST("f_code")); + assert(code.get()); + PyObjectHandle func = PyObject_GetAttrString(code.get(), STRCAST("co_name")); diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ef66d071677..1fbd1730b01 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -40633,7 +40633,10 @@ (define-public python-zeroc-ice-3.6 (uri (pypi-uri "zeroc-ice" version)) (sha256 (base32 - "0mikjfvq26kh8asnn9v55z41pap4c5ypymqnwwi4xkavc3mzyda2")))))) + "0mikjfvq26kh8asnn9v55z41pap4c5ypymqnwwi4xkavc3mzyda2")) + (patches + (search-patches + "python-zeroc-ice-3.6.5-python-3.11-support.patch")))))) (define-public python-whenever (package -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 22 08:04:23 2025 Received: (at 77986) by debbugs.gnu.org; 22 Apr 2025 12:04:23 +0000 Received: from localhost ([127.0.0.1]:46611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7CMR-0007Gp-7v for submit@debbugs.gnu.org; Tue, 22 Apr 2025 08:04:23 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:51907) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7CMM-0007GP-3i for 77986@debbugs.gnu.org; Tue, 22 Apr 2025 08:04:19 -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 4Zhgrc2VTtz1VLj; Tue, 22 Apr 2025 12:04:16 +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 <77986@debbugs.gnu.org>; Tue, 22 Apr 2025 12:04:16 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.145]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4Zhgrc04mTzy97; Tue, 22 Apr 2025 12:04:16 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.3]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8A9A0DA3A30; Tue, 22 Apr 2025 12:04:15 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0069558b128-635f-486f-85a4-a17d1d3328dd, 0A1BC1951B487096A19EF2AF6351B65704E5605C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: 77986@debbugs.gnu.org Subject: [PATCH 2/2] gnu: python-omero-py: Update to 5.20.0. Date: Tue, 22 Apr 2025 14:04:04 +0200 Message-ID: <20250422120409.4287-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250422120409.4287-1-ngraves@ngraves.fr> References: <20250422120409.4287-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 9637703202857083618 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvgeefieekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepuddvueeljeeiieevjedtgfdvgfehhfdtfeeikeduvdelteeikeeluefgveeftefhnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpohhpvghnmhhitghrohhstghophihrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeelkeeiseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=7GPBCqE4JTk6mgcxjc02zyVBg2Ardh6wYrxaLWH6xsc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745323456; v=1; b=R1l7SGkktRIxZa+MdEjoZD07mCSGNsZigxJx7fIjPzhPgLVvq+3wB5BA6I2j/KWzXMwYDhsv nFXz0OVJxI2WgNISrLqvxgTkwbiJHzcsI9t6QhMjV6m/12KbV6Lrc2LYNjckaNAyVbfBfiyvu9e Xo3L0Eu8+GoQzUlVyvbWOtcZFTf1P5C5gQGA2GFZGl9t55Van/NSG+v/agRVYuLHs5qUPZ3KhRz HE/uLdxcVZQFux36+sq2OQBXUhFSe2Ju3Rd0EONH5IdKEMyBu1VZ22osGj4bKvBETe/rXheTsuB H5o/2wH2fwFiIoeWf6oZYZXXosBjHjqFs2yVCFG+GQHVg== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77986 Cc: Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/python-xyz.scm (python-omero-py): Update to 5.20.0. [arguments]: Ignore collection of some tests (which should be fixed when updating to numpy@2). [native-inputs]: Add python-portalocker. Update omero-blitz to 5.8.2. --- gnu/packages/python-xyz.scm | 168 +++++++++++++++++++----------------- 1 file changed, 91 insertions(+), 77 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1fbd1730b01..e60d21207e4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5155,84 +5155,98 @@ (define-public python-et-xmlfile (license license:expat))) (define-public python-omero-py - (package - (name "python-omero-py") - (version "5.13.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ome/omero-py") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0n94v5dpmh873hjqd9k9ky85iab4xh37ibmi13rqpclv01ibvvxa")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - '(list "-m" "not broken" "-rf" "test" "-s" - ;; TestImport tries to download Java things; TestSessions - ;; and TestBuildQuery require networking. - "-k" "not TestImport and not TestSessions and not TestBuildQuery") - #:modules '((guix build pyproject-build-system) - (guix build utils) - (ice-9 match) - (srfi srfi-1) - (srfi srfi-26)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'find-artifacts - (lambda* (#:key inputs #:allow-other-keys) - (let ((zip-file - (match inputs - (((labels . files) ...) - (find (cut string-suffix? "omero-blitz-5.5.5-python.zip" <>) - files))))) - (setenv "ZIP_FILE" - (or zip-file (error "failed to find artifact file")))))) - ;; Some tests need this, such as TestTempFileManager - (add-after 'build 'set-HOME - (lambda _ (setenv "HOME" "/tmp"))) - ;; The sanity check mistakes omero_model_TypeAnnotationI.py for a - ;; module to load. - (delete 'sanity-check) - ;; The argument parser is picky and interprets the "-real" part as - ;; the first argument. - (add-after 'wrap 'rename-executable - (lambda _ - (with-directory-excursion (string-append #$output "/bin") - (rename-file ".omero-real" ".omero") - (substitute* "omero" - (("bin/.omero-real") "bin/.omero")))))))) - (propagated-inputs - (list python-appdirs - python-future - python-numpy - python-pillow - python-pyyaml - python-requests - python-tables - python-zeroc-ice-3.6)) - (native-inputs - (list python-mox3 - python-pytest - python-pytest-rerunfailures - python-pytest-xdist - python-setuptools - python-wheel - unzip - (origin - (method url-fetch) - (uri "https://artifacts.openmicroscopy.org/artifactory/\ -ome.releases/org/openmicroscopy/omero-blitz/5.5.5/omero-blitz-5.5.5-python.zip") - (sha256 - (base32 "0wyja1zv19c1r3m31gsp555jzj3cg2v2pl00zlybpw3qd36yffwc"))))) - (home-page "https://github.com/ome/omero-py") - (synopsis "Python bindings to the OMERO.blitz server") - (description "This package provides Python bindings to the OMERO.blitz + (let ((omero-blitz-version "5.8.2")) + (package + (name "python-omero-py") + (version "5.20.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ome/omero-py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02zsw1p35n6lkqh410qpgw7c4467dkbg0hxly3gjqrwdh349j47g")))) + (build-system pyproject-build-system) + (arguments + (list + ;; #:tests? #f + #:test-flags + #~(list + "-m" "not broken" "-rf" "test" "-s" + ;; XXX: Failing collection because of Numpy compatibility. + "--ignore=test/unit/tablestest/test_hdfstorage.py" + "--ignore=test/unit/tablestest/test_servants.py" + ;; TestImport tries to download Java things; TestSessions + ;; and TestBuildQuery require networking. + "-k" "not TestImport and not TestSessions and not TestBuildQuery") + #:modules '((guix build pyproject-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-1) + (srfi srfi-26)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'find-artifacts + (lambda* (#:key inputs #:allow-other-keys) + (let ((zip-file + (match inputs + (((labels . files) ...) + (find (cut string-suffix? + (string-append "omero-blitz-" + #$omero-blitz-version + "-python.zip") + <>) + files))))) + (setenv "ZIP_FILE" + (or zip-file (error "failed to find artifact file")))))) + ;; Some tests need this, such as TestTempFileManager + (add-after 'build 'set-HOME + (lambda _ (setenv "HOME" "/tmp"))) + ;; The sanity check mistakes omero_model_TypeAnnotationI.py for a + ;; module to load. + (delete 'sanity-check) + ;; The argument parser is picky and interprets the "-real" part as + ;; the first argument. + (add-after 'wrap 'rename-executable + (lambda _ + (with-directory-excursion (string-append #$output "/bin") + (rename-file ".omero-real" ".omero") + (substitute* "omero" + (("bin/.omero-real") "bin/.omero")))))))) + (propagated-inputs + (list python-appdirs + python-future + python-numpy-2 + python-pillow + python-pyyaml + python-requests + python-tables + python-zeroc-ice-3.6)) + (native-inputs + (list python-portalocker + python-pytest + python-pytest-mock + python-pytest-rerunfailures + python-pytest-xdist + python-setuptools + python-wheel + unzip + (origin + (method url-fetch) + (uri (format #f "\ +https://artifacts.openmicroscopy.org/artifactory/ome.releases/org/\ +openmicroscopy/omero-blitz/~a/omero-blitz-~a-python.zip" + omero-blitz-version + omero-blitz-version)) + (sha256 + (base32 "1nb17xmx6n7i5vkcw661iq42yfgc3i0gmhz3x8iwcrhp8pajzm3l"))))) + (home-page "https://github.com/ome/omero-py") + (synopsis "Python bindings to the OMERO.blitz server") + (description "This package provides Python bindings to the OMERO.blitz server.") - (license license:gpl2))) + (license license:gpl2)))) (define-public python-openpyxl (package -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 23 18:19:20 2025 Received: (at 77986-done) by debbugs.gnu.org; 23 Apr 2025 22:19:20 +0000 Received: from localhost ([127.0.0.1]:59166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7iR4-0000oV-SQ for submit@debbugs.gnu.org; Wed, 23 Apr 2025 18:19:19 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:48162) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u7iR0-0000nL-HE for 77986-done@debbugs.gnu.org; Wed, 23 Apr 2025 18:19:15 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-39bf44be22fso239112f8f.0 for <77986-done@debbugs.gnu.org>; Wed, 23 Apr 2025 15:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745446748; x=1746051548; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=iOuQQC0HrssKPshpgEK57E+4KvtVeetIhf9TjabLDS4=; b=TBYZjf9xHxW+/k73IYR76BhUlgRGX7aALLyR80g3CyTYX1BXcL8yUmlJTOcYSeLcca ZEdEbmLhZeX3JLKQ7YfUENqP0eFeWVF7E8JaICxYlsRsAMOP45XPjFzhehKMgHODXwsK +r9b6XRNNrgAwEUCYpRChwwiDG2o4M8rJa85RJP/MoHCzM/FW0b0Zljda6SvPeqZrg5n OU/hitweVKERN3xdMOiqslD+3nAY9edtRIznKF/fDROFl9PgPR8VEfdBoBAQ8ayKtZJ5 0pZxIBEiDPTsNmrqkrLXhVIbgpPd+Tt7r0C65Kfdyzv06yLS6QSjBJxFGBqB624Eu6P4 zGaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745446748; x=1746051548; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iOuQQC0HrssKPshpgEK57E+4KvtVeetIhf9TjabLDS4=; b=Oyo9y3i984KgctUeLZQCbmazvXhHNghn6TQfvosX328W1hLMI+cnQ9dwB2T5jXbrMH +8qD9p/pEeYBi3vgnwKKQYWsOiE/dVZlSflcBRHs22fWR0tobhLcKh+P7TrJZiOGlwT8 wk9T/ul6WB889Ll3n4+2re8aNxBCpWHJrB48SVfV9ZvmPSFo+SVUGzs0UHSVqU27WhE/ dwp2gxk+z9So3Mc6B3zOdjbWpf7gfJ0mQdfe0T6pEMdKIWbfInSAZ0ASipU0tnXzoIEs ZgqfXb2HEE2J/e5VLbKzpqnWxNpCBD2ICKyBtcEuFiB7SfoViKEasB8k8aGAhQHCF4bq meZQ== X-Gm-Message-State: AOJu0YzP7igU8qdfaAwDp0R0sUlFc3nPqseJbNfQtQjw39PJmIIwHy1L uGSMwl8UfsOUfndI6ab1ufKUg81kOZJ1ZUU4JLyn3sqOtLL9fY27PQizW3BP X-Gm-Gg: ASbGncsfvzF0dRT2kosMGK4Yt2gWZmHbMOtOcZYBwy++ZX5O8fQV3uZGC6kVYqHQtSd bfm+7z6lbHjE0YB6g3My/JlffHTONpQPEnbEXJr/Eq+OS0YU5rjOesCEHydrDz8jzD76IxvYE+d kXT/bOIjE+ltLQbvwJaMiS0LpjbVtQ6q9ypOetkdfNn922Fp+AnGMmQe5WpscJm/bwk/i+eD4aK xAtjQ1KtNjnSfWfgYC9s3aMybQxtBEb5yrlULgPshyBbPK2Z15NcMWGBxWK3+8DbNA0nk8kDu/D s5ruACtEbA+7DkHgjfEJ5GzhypERD+L55stFzl9PA1Hg8Cd0KO8RpYTjV9PqKL8srqbv/tzoqkc KYF5LZ54uRUdUYXCuZ5VjY9MyanY= X-Google-Smtp-Source: AGHT+IGRBJY5UzCps3jO0T60r3bsx0QxrSOSOc+BIA0qtRTyUPlPKQz7AAEj/VKkVpR5Fs6UVM8U3w== X-Received: by 2002:a5d:584a:0:b0:39c:dfa:c3de with SMTP id ffacd0b85a97d-3a06cfaf232mr127633f8f.47.1745446747758; Wed, 23 Apr 2025 15:19:07 -0700 (PDT) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a06d4c4a51sm88617f8f.53.2025.04.23.15.19.06 for <77986-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 15:19:06 -0700 (PDT) From: Sharlatan Hellseher To: 77986-done@debbugs.gnu.org Subject: [PATCH 0/2] Update and fix python-omero-py. Date: Wed, 23 Apr 2025 23:19:05 +0100 Message-ID: <87cyd2zfl2.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77986-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Thanks for resolving it! Pushed to master as:=20 3901b539d2 * gnu: python-omero-py: Update to 5.20.0. 03c4dc54a7 * gnu: python-zeroc-ice-3.6: Fix build with Python@3.11. =2D- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJKBAEBCgA0FiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmgJZ1kWHHNoYXJsYXRh bnVzQGdtYWlsLmNvbQAKCRB21ye/9izStRQFD/4sroKr5PRaoD35WMJpdcLCujZO SZ2iDX4tTPnEvD6ROQTjp9QV/brFhAirHwvx7fQXGNiG7Zzo1wPLYWHS/qbsVL+s 47sY2vwMmz8lByqnN7Uckx4Vafy07WUoQqeoOKV1gRdBKl8idFLqjyASAac1trJD Pycug6ni183VT2WNW7IgM2fkJfuNprAID8Ip8QiNDDcEJUg/oIJ4uTZFK0Mzr1lq X5azf7NQ02xSAIHJf8dE/trjVi2JTHOREE4+W3JRsuo2lQ09zni7RgklzczCIhw5 EvuS9QMXgv4WiW8bLITCdDh7n/ApfiyP1PP7pvVTXHbAAH0wFa1/wapfGleTA0sJ CJDPca417fegZJoo66zqEbQ279XjedtJkpgK/UKrp7y70t9rF67QIZ2antV9a8bJ uu0ahWy7TFCCUyzSHzkI1jwpbrSFmZIk/489jEF2bfsgtE3SJcud2wyDvp13tyGc wccWHubSt/9cBD5ZZI+RIjDcRlSB2isC50xSAZ2mPIX/f1gvCRpF77z1od5yyEz1 6iUO4D59OXpUSFI3E+OlLdi8uRSdgy9cw2sbWYxqlupVgudbODB+0XpMciMmkNBL qAqdJwwoka1eEKH0giWMLceDvhbYeRZMVKM85TGvYPi++p1BaWN9WWEfC+0v16XU 684yopOiixXRXvvd8g== =C7fs -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Jun 17 01:28:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 22 May 2025 11:24:20 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator