From patchwork Sat May 18 12:43:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 64588 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 61C8427BBE9; Sat, 18 May 2024 13:44:26 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 4A14427BBE2 for ; Sat, 18 May 2024 13:44:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8JPt-0007D1-Cx; Sat, 18 May 2024 08:44:01 -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 1s8JPr-0007CQ-Ab for guix-patches@gnu.org; Sat, 18 May 2024 08:43:59 -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 1s8JPq-0006z0-Lm for guix-patches@gnu.org; Sat, 18 May 2024 08:43:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8JPu-0000FG-0K for guix-patches@gnu.org; Sat, 18 May 2024 08:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71037] [PATCH 1/3] gnu: python-pydevd: Move to pyproject-build-system. References: <20240518123734.9898-1-ngraves@ngraves.fr> In-Reply-To: <20240518123734.9898-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 May 2024 12:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71037@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 71037-submit@debbugs.gnu.org id=B71037.1716036207884 (code B ref 71037); Sat, 18 May 2024 12:44:01 +0000 Received: (at 71037) by debbugs.gnu.org; 18 May 2024 12:43:27 +0000 Received: from localhost ([127.0.0.1]:33283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8JPL-0000EC-5Z for submit@debbugs.gnu.org; Sat, 18 May 2024 08:43:27 -0400 Received: from 9.mo576.mail-out.ovh.net ([46.105.56.78]:33897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8JPI-0000E5-QY for 71037@debbugs.gnu.org; Sat, 18 May 2024 08:43:26 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.2.12]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4VhNm73jd1z1hWp for <71037@debbugs.gnu.org>; Sat, 18 May 2024 12:43:19 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-8s99p (unknown [10.110.96.9]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 31ADE1FE82; Sat, 18 May 2024 12:43:19 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-8s99p with ESMTPSA id /GIjCGeiSGZmLhAACdQIbw (envelope-from ); Sat, 18 May 2024 12:43:19 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S00342f7db73-ba78-4348-974b-0b14ae4fbc82, BDB7418199CE68AC6294CEC755C667778ECDC1D2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sat, 18 May 2024 14:43:05 +0200 Message-ID: <20240518124316.19861-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 11702322157262398178 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdehiedggeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelueehgfevfeevhffftdetgedugeevveehteeileeuueejhfegffetteffhffhvdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejuddtfeejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth 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-pydevd): [build-system]: Move to pyproject-build-system. [arguments]: Replace 'check phase by 'pre-check phase and <#:test-flags>. Change-Id: I8227ac8b1b6031c30c6d09480cacaa3347df21a7 --- gnu/packages/python-xyz.scm | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8151355a418..c2039273429 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16717,9 +16717,29 @@ (define-public python-pydevd (sha256 (base32 "1yd017dh6xgxrqcyf8kk8jrr0a3zw895yfjih0z5jghyf0rck38q")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list + #:test-flags + #~(list "-n" (number->string (parallel-job-count)) + "-k" + (string-append + ;; The two "break_01" tests have been failing on + ;; Python 3.10: + ;; . + "not test_set_pydevd_break_01 " + ;; This one fails for unknown reasons. + "and not test_completion_sockets_and_messages " + ;; the GUI event loop requires an X server. + "and not test_gui_event_loop_custom " + ;; This test validates that 'pydevd' is not in the + ;; exception message, but it is due to being part + ;; of the build file name present in the message. + "and not test_evaluate_exception_trace " + ;; These fail on systems with YAMA LSM’s ptrace + ;; scope > 0. Upstream issue: + ;; https://github.com/fabioz/PyDev.Debugger/issues/218 + "and not test_attach_to_pid")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-tests @@ -16758,30 +16778,10 @@ (define-public python-pydevd (invoke #+(cxx-for-target) "-shared" "-o" "attach.so" "-fPIC" "-nostartfiles" "pydevd_attach_to_process/linux_and_mac/attach.cpp"))) - (replace 'check + (add-before 'check 'pre-check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (setenv "PYDEVD_USE_CYTHON" "YES") - (invoke "pytest" "-vv" - "-n" (number->string (parallel-job-count)) - "-k" - (string-append - ;; The two "break_01" tests have been failing on - ;; Python 3.10: - ;; . - "not test_set_pydevd_break_01 " - ;; This one fails for unknown reasons. - "and not test_completion_sockets_and_messages " - ;; the GUI event loop requires an X server. - "and not test_gui_event_loop_custom " - ;; This test validates that 'pydevd' is not in the - ;; exception message, but it is due to being part - ;; of the build file name present in the message. - "and not test_evaluate_exception_trace " - ;; These fail on systems with YAMA LSM’s ptrace - ;; scope > 0. Upstream issue: - ;; https://github.com/fabioz/PyDev.Debugger/issues/218 - "and not test_attach_to_pid"))))) + (setenv "PYDEVD_USE_CYTHON" "YES")))) (add-after 'install 'install-attach-binary (lambda _ (install-file "attach.so" From patchwork Sat May 18 12:43:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 64587 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 E1E6E27BBE9; Sat, 18 May 2024 13:44: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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 77A1927BBE2 for ; Sat, 18 May 2024 13:44:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8JPs-0007Cy-Jv; Sat, 18 May 2024 08:44:00 -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 1s8JPr-0007CS-CU for guix-patches@gnu.org; Sat, 18 May 2024 08:43:59 -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 1s8JPr-0006z9-3w for guix-patches@gnu.org; Sat, 18 May 2024 08:43:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8JPu-0000FN-Fx for guix-patches@gnu.org; Sat, 18 May 2024 08:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71037] [PATCH 2/3] gnu: python-pydevd: Update to 2.9.6. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 May 2024 12:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71037@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 71037-submit@debbugs.gnu.org id=B71037.1716036211901 (code B ref 71037); Sat, 18 May 2024 12:44:02 +0000 Received: (at 71037) by debbugs.gnu.org; 18 May 2024 12:43:31 +0000 Received: from localhost ([127.0.0.1]:33286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8JPO-0000ER-KW for submit@debbugs.gnu.org; Sat, 18 May 2024 08:43:30 -0400 Received: from 10.mo576.mail-out.ovh.net ([46.105.73.241]:36195) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8JPL-0000EB-HL for 71037@debbugs.gnu.org; Sat, 18 May 2024 08:43:28 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.25.157]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4VhNmB5zMvz1hWp for <71037@debbugs.gnu.org>; Sat, 18 May 2024 12:43:22 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kbtjd (unknown [10.108.54.212]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 64E251FE6A; Sat, 18 May 2024 12:43:22 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-kbtjd with ESMTPSA id 05fHDWqiSGbvWwEAEthkDA (envelope-from ); Sat, 18 May 2024 12:43:22 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S00353893515-ae1c-417f-b99b-f4984f4fdd8b, BDB7418199CE68AC6294CEC755C667778ECDC1D2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sat, 18 May 2024 14:43:06 +0200 Message-ID: <20240518124316.19861-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240518124316.19861-1-ngraves@ngraves.fr> References: <20240518124316.19861-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11703166585473065698 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdehiedggeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvffehgeekhfekgffgleehffetiefggeeitdduteekfffhkeehveejfeejledtieenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejuddtfeejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth 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-pydevd): Update to 2.9.6. [arguments]<#:test-flags>: Adapt value. Change-Id: I55cc8129fb78f0ee54519f45b31746a54881d84e --- gnu/packages/python-xyz.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c2039273429..fb12aba967f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16694,19 +16694,17 @@ (define-public python-file libmagic."))) (define-public python-pydevd - ;; Use the latest commit, which includes cleanups that removes Python 2 - ;; syntax that would fail to build. - (let ((revision "0") - (commit "47e298499ef19563bb2ef5941a57046a35ae6868")) (package (name "python-pydevd") - (version (git-version "2.8.0" revision commit)) + (version "2.9.6") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/fabioz/PyDev.Debugger") - (commit commit))) + (commit (string-append + "pydev_debugger_" + (string-join (string-split version #\.) "_"))))) (modules '((guix build utils))) (snippet '(begin ;; Delete pre-built binaries. @@ -16716,7 +16714,7 @@ (define-public python-pydevd (file-name (git-file-name name version)) (sha256 (base32 - "1yd017dh6xgxrqcyf8kk8jrr0a3zw895yfjih0z5jghyf0rck38q")))) + "1niqb6l3m03arfjh14k9k5i5bi56m8qmc3pyi1qkbvqqp5bkydac")))) (build-system pyproject-build-system) (arguments (list @@ -16728,18 +16726,14 @@ (define-public python-pydevd ;; Python 3.10: ;; . "not test_set_pydevd_break_01 " - ;; This one fails for unknown reasons. - "and not test_completion_sockets_and_messages " ;; the GUI event loop requires an X server. "and not test_gui_event_loop_custom " ;; This test validates that 'pydevd' is not in the ;; exception message, but it is due to being part ;; of the build file name present in the message. "and not test_evaluate_exception_trace " - ;; These fail on systems with YAMA LSM’s ptrace - ;; scope > 0. Upstream issue: - ;; https://github.com/fabioz/PyDev.Debugger/issues/218 - "and not test_attach_to_pid")) + ;; This test fail with TimeoutError, no message on stderr. + "and not test_soft_terminate ")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-tests @@ -16802,7 +16796,7 @@ (define-public python-pydevd (synopsis "Python debugger") (description "PyDev.Debugger is a capable Python debugger used in PyDev and other @acronym{IDEs, Integrated Development Environments}.") - (license license:epl1.0)))) + (license license:epl1.0))) (define-public python-debugpy (package From patchwork Sat May 18 12:43:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 64589 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 C4C2A27BBEA; Sat, 18 May 2024 13:44:28 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 87F9F27BBE2 for ; Sat, 18 May 2024 13:44:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8JPt-0007D0-5w; Sat, 18 May 2024 08:44:01 -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 1s8JPr-0007Cn-RH for guix-patches@gnu.org; Sat, 18 May 2024 08:43:59 -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 1s8JPr-0006zH-JH for guix-patches@gnu.org; Sat, 18 May 2024 08:43:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8JPu-0000FU-V2 for guix-patches@gnu.org; Sat, 18 May 2024 08:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71037] [PATCH 3/3] gnu: python-pydevd: Improve package style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 May 2024 12:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71037@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 71037-submit@debbugs.gnu.org id=B71037.1716036219917 (code B ref 71037); Sat, 18 May 2024 12:44:02 +0000 Received: (at 71037) by debbugs.gnu.org; 18 May 2024 12:43:39 +0000 Received: from localhost ([127.0.0.1]:33291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8JPT-0000Ei-0R for submit@debbugs.gnu.org; Sat, 18 May 2024 08:43:38 -0400 Received: from 5.mo581.mail-out.ovh.net ([178.32.120.239]:53363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8JPQ-0000ES-4o for 71037@debbugs.gnu.org; Sat, 18 May 2024 08:43:33 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.9.29]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4VhNmG6Cygz1GgC for <71037@debbugs.gnu.org>; Sat, 18 May 2024 12:43:26 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-2csr6 (unknown [10.110.113.149]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A12131FE00; Sat, 18 May 2024 12:43:26 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-2csr6 with ESMTPSA id 0bd5JG6iSGa81wAAJGEfkA (envelope-from ); Sat, 18 May 2024 12:43:26 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006f5b1b190-3341-44c8-8969-9db88554ed06, BDB7418199CE68AC6294CEC755C667778ECDC1D2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sat, 18 May 2024 14:43:07 +0200 Message-ID: <20240518124316.19861-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240518124316.19861-1-ngraves@ngraves.fr> References: <20240518124316.19861-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11704292485853143778 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdehiedggeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedutdefjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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-pydevd): Indent properly. Change-Id: I854d32943416e5f9b7c8dd3602d975dde0d31153 --- gnu/packages/python-xyz.scm | 204 ++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fb12aba967f..aaca34e0e29 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16694,109 +16694,109 @@ (define-public python-file libmagic."))) (define-public python-pydevd - (package - (name "python-pydevd") - (version "2.9.6") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fabioz/PyDev.Debugger") - (commit (string-append - "pydev_debugger_" - (string-join (string-split version #\.) "_"))))) - (modules '((guix build utils))) - (snippet '(begin - ;; Delete pre-built binaries. - (for-each delete-file (find-files "." "\\.(so|dylib|dll)")) - ;; This source is generated via Cython. - (delete-file "_pydevd_bundle/pydevd_cython.c"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1niqb6l3m03arfjh14k9k5i5bi56m8qmc3pyi1qkbvqqp5bkydac")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - #~(list "-n" (number->string (parallel-job-count)) - "-k" - (string-append - ;; The two "break_01" tests have been failing on - ;; Python 3.10: - ;; . - "not test_set_pydevd_break_01 " - ;; the GUI event loop requires an X server. - "and not test_gui_event_loop_custom " - ;; This test validates that 'pydevd' is not in the - ;; exception message, but it is due to being part - ;; of the build file name present in the message. - "and not test_evaluate_exception_trace " - ;; This test fail with TimeoutError, no message on stderr. - "and not test_soft_terminate ")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "tests_python/test_convert_utilities.py" - ;; Add missing trailing '/'. - (("'\\\\\\\\usr\\\\\\\\bin\\\\\\\\') == '/usr/bin" all) - (string-append all "/"))))) - (add-after 'unpack 'patch-command-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "_pydevd_bundle/pydevd_api.py" - (("'kill'") - (format #f "~s" (search-input-file inputs "bin/kill"))) - (("'pgrep'") - (format #f "~s" (search-input-file inputs "bin/pgrep")))))) - (add-after 'unpack 'generate-sources - (lambda _ - (setenv "PYTHONPATH" (getcwd)) - (invoke "python" "build_tools/build.py"))) - (add-after 'unpack 'adjust-attach-binary-name - (lambda _ - (substitute* - '("pydevd_tracing.py" - "pydevd_attach_to_process/add_code_to_python_process.py") - (("def get_(target|python_helper_lib)_filename.*" all) - (format #f "~a return ~s~%" all - (string-append #$output "/lib/attach.so")))))) - (add-after 'unpack 'patch-gdb - (lambda* (#:key inputs #:allow-other-keys) - (substitute* - "pydevd_attach_to_process/add_code_to_python_process.py" - (("'gdb',") - (format #f "~s," (search-input-file inputs "bin/gdb")))))) - (add-after 'build 'build-attach-linux-binary - (lambda _ - (invoke #+(cxx-for-target) "-shared" "-o" "attach.so" - "-fPIC" "-nostartfiles" - "pydevd_attach_to_process/linux_and_mac/attach.cpp"))) - (add-before 'check 'pre-check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "PYDEVD_USE_CYTHON" "YES")))) - (add-after 'install 'install-attach-binary - (lambda _ - (install-file "attach.so" - (string-append #$output "/lib")))) - ;; Some modules aren't designed to be loadable by themselves, such - ;; as 'pydev_app_engine_debug_startup' and fail. - (delete 'sanity-check)))) - (native-inputs - (list python-cython - python-numpy - python-psutil - python-pytest - python-pytest-xdist - python-trio - python-untangle)) - (inputs (list coreutils gdb/pinned procps)) - (home-page "https://github.com/fabioz/PyDev.Debugger/") - (synopsis "Python debugger") - (description "PyDev.Debugger is a capable Python debugger used in PyDev + (package + (name "python-pydevd") + (version "2.9.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fabioz/PyDev.Debugger") + (commit (string-append + "pydev_debugger_" + (string-join (string-split version #\.) "_"))))) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete pre-built binaries. + (for-each delete-file (find-files "." "\\.(so|dylib|dll)")) + ;; This source is generated via Cython. + (delete-file "_pydevd_bundle/pydevd_cython.c"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1niqb6l3m03arfjh14k9k5i5bi56m8qmc3pyi1qkbvqqp5bkydac")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-n" (number->string (parallel-job-count)) + "-k" + (string-append + ;; The two "break_01" tests have been failing on + ;; Python 3.10: + ;; . + "not test_set_pydevd_break_01 " + ;; the GUI event loop requires an X server. + "and not test_gui_event_loop_custom " + ;; This test validates that 'pydevd' is not in the + ;; exception message, but it is due to being part + ;; of the build file name present in the message. + "and not test_evaluate_exception_trace " + ;; This test fail with TimeoutError, no message on stderr. + "and not test_soft_terminate ")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "tests_python/test_convert_utilities.py" + ;; Add missing trailing '/'. + (("'\\\\\\\\usr\\\\\\\\bin\\\\\\\\') == '/usr/bin" all) + (string-append all "/"))))) + (add-after 'unpack 'patch-command-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "_pydevd_bundle/pydevd_api.py" + (("'kill'") + (format #f "~s" (search-input-file inputs "bin/kill"))) + (("'pgrep'") + (format #f "~s" (search-input-file inputs "bin/pgrep")))))) + (add-after 'unpack 'generate-sources + (lambda _ + (setenv "PYTHONPATH" (getcwd)) + (invoke "python" "build_tools/build.py"))) + (add-after 'unpack 'adjust-attach-binary-name + (lambda _ + (substitute* + '("pydevd_tracing.py" + "pydevd_attach_to_process/add_code_to_python_process.py") + (("def get_(target|python_helper_lib)_filename.*" all) + (format #f "~a return ~s~%" all + (string-append #$output "/lib/attach.so")))))) + (add-after 'unpack 'patch-gdb + (lambda* (#:key inputs #:allow-other-keys) + (substitute* + "pydevd_attach_to_process/add_code_to_python_process.py" + (("'gdb',") + (format #f "~s," (search-input-file inputs "bin/gdb")))))) + (add-after 'build 'build-attach-linux-binary + (lambda _ + (invoke #+(cxx-for-target) "-shared" "-o" "attach.so" + "-fPIC" "-nostartfiles" + "pydevd_attach_to_process/linux_and_mac/attach.cpp"))) + (add-before 'check 'pre-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "PYDEVD_USE_CYTHON" "YES")))) + (add-after 'install 'install-attach-binary + (lambda _ + (install-file "attach.so" + (string-append #$output "/lib")))) + ;; Some modules aren't designed to be loadable by themselves, such + ;; as 'pydev_app_engine_debug_startup' and fail. + (delete 'sanity-check)))) + (native-inputs + (list python-cython + python-numpy + python-psutil + python-pytest + python-pytest-xdist + python-trio + python-untangle)) + (inputs (list coreutils gdb/pinned procps)) + (home-page "https://github.com/fabioz/PyDev.Debugger/") + (synopsis "Python debugger") + (description "PyDev.Debugger is a capable Python debugger used in PyDev and other @acronym{IDEs, Integrated Development Environments}.") - (license license:epl1.0))) + (license license:epl1.0))) (define-public python-debugpy (package