From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id aCiMGqyiSGYyWQAAqHPOHw:P1 (envelope-from ) for ; Sat, 18 May 2024 14:44:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id aCiMGqyiSGYyWQAAqHPOHw (envelope-from ) for ; Sat, 18 May 2024 14:44:28 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716036268; a=rsa-sha256; cv=none; b=qn6G0f93Vf3KAR/cEhZAmnBR4FUSt+vhkwCTAoWqrKG5pJe/e7XTq/f2CoyC8WuMFMrNSj e+FAdXjK9q/QdAWQCzgIDIHBFYCQewbDMkyPvKsmxZarzXd03bkMQ29B5YFC7ByLaeIrfD 8hZ7VpM2Hd4EsZv1bkCK19FRznLE+zMeMJiMKqYDiAvONwUoZJ8bQlNtxwtShkLlBIcZga p+U975OaKxFbL9dNo3bPKdfLXED4WIy84dIE9GexGWAOH3VXpdajUxLq8134s4Hwsz0Jf4 Hr2bA4wpN7Sgsa37O6R30dbcgu5oNtfef9cnMQqvJmaXWUNxdrYGPKYHhC/ukg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716036268; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=BWhK2JPlUE3e7Tu2/ce+sp7JAM/Hq5aV74vP9Xv8BbE=; b=gJvwPmPT/z7nDofsqjwaEgGGQTw485/fQx9l43xpribjiRVC4Ma14pEkgP+DHTTDIqnF/Q MUrGdL7i/IMo9pC2kCFLLH4x8WztXw6ikfOez392fWMynlAtHpFUUSAsL3J5FNYSvIy8K2 IHstoDKearZKgVwIOUupD7wXThO7RPGMpiB/vksfZuZTUGi2cWKUYfjW6dsOD1fuNeZBeX rg+IHMAZrP6Iyi2KRpxFQm348Zx9vyRItrUZSEjPmZDrPfZ3eA+fBtj4xAmPJuZTHUnxxa zZvCHJbvc1QcEPqLGbP1llVH8lPPRKr0TKIvlDQ7KdcFQidN0qcfepmpr7XX7g== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C99C212A8F for ; Sat, 18 May 2024 14:44:27 +0200 (CEST) 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 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 Content-Transfer-Encoding: 8bit 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: C99C212A8F X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.36 X-Spam-Score: -6.36 X-TUID: n/KAj0zS1WBn * 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 -- 2.41.0