From patchwork Mon Mar 31 06:18:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41064 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 1A5E127BBEA; Mon, 31 Mar 2025 07:21: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 700F527BBE2 for ; Mon, 31 Mar 2025 07:21:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tz8WY-0005BR-IG; Mon, 31 Mar 2025 02:21:30 -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 1tz8WD-0004zF-QY for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:10 -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 1tz8WD-0008A9-9R for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:09 -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=mdMRvjW3ak2L5SABLJ0F16xEB3oG6siroGN7az7XD0w=; b=gOKzsuZwvYl98Mnt12MLHF5zBRCdpmqt+HtJoct15jQONYuxD6IBfsZyfqqSj2BlofVngxVdukPF6rrqQQhT1C0DtBnBgzQeGz9y+X51uh2nAflLfK0V6H+5Z7HQSALDTRCLLOQKJV5c0HplhaM5q+Y4l+Dix3Qp7olePe4Fkl+GlBVtxC1W8b880KDXb6zWTqLMnc7XtiHiUX/rMdmLW0DRoyoCFPwevrdNF/joqw/eTHTL/NoHMUbajjZbQWOVjwjiAKYB19a2Bp9vLyWYEbw02AzYNc4sDQ/XiM4Z3DBvgPmSu9uiOHLPxU5wevgKhXYmAmjI7H1aaYrN/bBXcw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tz8WD-0007Nd-48 for guix-patches@gnu.org; Mon, 31 Mar 2025 02:21:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77400] [PATCH 16/26] gnu: python-sip: Update to 6.10.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Mar 2025 06:21:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77400@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 77400-submit@debbugs.gnu.org id=B77400.174340203427984 (code B ref 77400); Mon, 31 Mar 2025 06:21:09 +0000 Received: (at 77400) by debbugs.gnu.org; 31 Mar 2025 06:20:34 +0000 Received: from localhost ([127.0.0.1]:39282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tz8Vd-0007H0-37 for submit@debbugs.gnu.org; Mon, 31 Mar 2025 02:20:34 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:41771) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tz8UT-0006zU-73 for 77400@debbugs.gnu.org; Mon, 31 Mar 2025 02:19:22 -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 4ZR1Dm1bJLz1dG7; Mon, 31 Mar 2025 06:19:20 +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 <77400@debbugs.gnu.org>; Mon, 31 Mar 2025 06:19:20 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.139.218]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZR1Dm12K5zyBb; Mon, 31 Mar 2025 06:19:20 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.2]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9402AC391D; Mon, 31 Mar 2025 06:19:19 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S0082b7301b9-6f73-4829-a2a8-df8b5ca93259, 87830A87949A0BA70EB5F3889DD10BC79FDA47E2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 31 Mar 2025 08:18:44 +0200 Message-ID: <20250331061901.22670-16-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250331061901.22670-1-ngraves@ngraves.fr> References: <20250331061901.22670-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3740239494253634274 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptedvvdduteffvdeiteffgffhueduieektdfgjeehheekkefhfeeiteefveeiueejnecuffhomhgrihhnpehgihhthhhusgdrtghomhdprhhivhgvrhgsrghnkhgtohhmphhuthhinhhgrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejjeegtddtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=mdMRvjW3ak2L5SABLJ0F16xEB3oG6siroGN7az7XD0w=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1743401960; v=1; b=bzb48OpOZKKbcSARNmHBRN8xFzGkHMBeBM2KcU9+y5F/x5rM6thynXTzyoRlewEJDXVyR30J gC2HJ9kLZdEhZblO3iGj6yYDxWfw1goxGL5bc4mXQcQn41aa5MSF8+RityjUa5fw0SQcTwn6Yca BbDytH02ScvRpfwKkiAmfAtQXtW8/2Ui7UWU51x1huIx2V1wmFY6FiHijUeC1evBEBFoh+aLBk5 FQR9hL2Yw3GzldGEOnZjp0Gz4GoqoVA6X9eReEX6GqJs2Q6LfXws9fVXGAYQ2pk4Fy0Lf3dQW75 /xVtvl/1F7ZDj6MW2XrTnN8sL5WgwvWtkcGDPtZiOjG6Q== 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/qt.scm (python-sip): Update to 6.10.0. [source]: Add snippet to relax python-setuptools requirement. [native-inputs]: Remove python-wrapper. Add python-wheel. Sort inputs. [propagated-inputs]: Remove python-tomli, python-wheel. Sort inputs. * gnu/packages/backup.scm (vorta)[native-inputs]: Add python-setuptools, python-wheel. * gnu/packages/python-xyz.scm (python-echo)[native-inputs]: Add python-setuptools, python-wheel. * gnu/packages/patches/python-sip-include-dirs.patch: Refresh patch. --- gnu/packages/backup.scm | 4 +++- .../patches/python-sip-include-dirs.patch | 17 ++++++++--------- gnu/packages/python-xyz.scm | 2 ++ gnu/packages/qt.scm | 16 +++++++++------- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 13c5590f55..cf06f7c1e6 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1443,7 +1443,9 @@ (define-public vorta python-pytest-mock python-pytest-qt python-pytest-runner - python-setuptools-git)) + python-setuptools + python-setuptools-git + python-wheel)) (inputs (list borg python-appdirs diff --git a/gnu/packages/patches/python-sip-include-dirs.patch b/gnu/packages/patches/python-sip-include-dirs.patch index f2ef8fc1b2..e5626030b6 100644 --- a/gnu/packages/patches/python-sip-include-dirs.patch +++ b/gnu/packages/patches/python-sip-include-dirs.patch @@ -5,16 +5,15 @@ It seems that we cannot easily change the destination folder of these files though, so this variable must be set on a per-package basis (and non through search-path). ---- sip/sipbuild/builder.py 2023-03-22 09:06:37.588792878 +0100 -+++ sip/sipbuild/builder.py 2023-03-22 09:10:35.830181134 +0100 -@@ -254,6 +254,10 @@ +--- sip/sipbuild/builder.py ++++ sip/sipbuild/builder.py +@@ -227,5 +227,9 @@ os.path.join(project.target_dir, project.get_bindings_dir())) -+ # Add extra bindings from environment for GNU Guix. -+ if 'SIP_INCLUDE_DIRS' in os.environ: -+ sip_include_dirs.extend(os.environ['SIP_INCLUDE_DIRS'].split(os.pathsep)) ++ # Add extra bindings from environment for GNU Guix ++ if 'SIP_INCLUDE_DIRS' in os.environ: ++ sip_include_dirs.extend(os.environ['SIP_INCLUDE_DIRS'].split(os.pathsep)) + - # Generate the sip.h file for the shared sip module. - copy_sip_h(abi_major_version, project.build_dir, - project.sip_module, version_info=project.version_info) + # Generate the code for each set of bindings. + api_files = [] diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2487ef88a9..e57c834ddb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3001,7 +3001,9 @@ (define-public python-echo (native-inputs (list python-pytest python-pytest-cov + python-setuptools python-setuptools-scm + python-wheel xorg-server-for-tests)) (home-page "https://github.com/glue-viz/echo") (synopsis "Callback Properties in Python") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 13893d2951..5a69c4baf7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4028,7 +4028,7 @@ (define-public pyotherside-for-qt5 (define-public python-sip (package (name "python-sip") - (version "6.8.6") + (version "6.10.0") (source (origin (method url-fetch) @@ -4038,18 +4038,20 @@ (define-public python-sip "/sip-" version ".tar.gz"))) (sha256 (base32 - "0ykxq0607f2sdwbl5cxbp0y8pl14bsgzc9nhifpxbibfivj5kjbz")) + "176jylhzs2ci2r9f3l75k9dpwhp1dn0qv2cy9phdp62cgmlia1gs")) + (modules '((guix build utils))) + (snippet + ;; Relax setuptools dependency + #~(substitute* "pyproject.toml" + (("\"setuptools>=.*\",") "\"setuptools\","))) (patches (search-patches "python-sip-include-dirs.patch")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ; No test system found. (native-inputs - (list python-wrapper python-setuptools python-setuptools-scm-next)) + (list python-setuptools python-setuptools-scm-next python-wheel)) (propagated-inputs - (list python-tomli - python-packaging - python-setuptools - python-wheel)) + (list python-packaging python-setuptools)) (home-page "https://www.riverbankcomputing.com/software/sip/intro") (synopsis "Python binding creator for C and C++ libraries") (description