From patchwork Fri Oct 27 16:42:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55406 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 8562E27BBE9; Fri, 27 Oct 2023 17:53:43 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 5C27927BBE2 for ; Fri, 27 Oct 2023 17:53:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwQ5Y-0000Wj-Nh; Fri, 27 Oct 2023 12:53:36 -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 1qwQ5T-0000Rw-GG for guix-patches@gnu.org; Fri, 27 Oct 2023 12:53:32 -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 1qwQ5T-0008P8-8Z for guix-patches@gnu.org; Fri, 27 Oct 2023 12:53:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwQ5y-0005lm-MQ for guix-patches@gnu.org; Fri, 27 Oct 2023 12:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66689] [PATCH gnome-team v4 10/17] gnu: python-pygobject: Update style. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Oct 2023 16:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66689 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: rg@raghavgururajan.name, 66689@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 66689-submit@debbugs.gnu.org id=B66689.169842563722153 (code B ref 66689); Fri, 27 Oct 2023 16:54:02 +0000 Received: (at 66689) by debbugs.gnu.org; 27 Oct 2023 16:53:57 +0000 Received: from localhost ([127.0.0.1]:36993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwQ5s-0005lE-U2 for submit@debbugs.gnu.org; Fri, 27 Oct 2023 12:53:57 -0400 Received: from planete-kraus.eu ([89.234.140.182]:50454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwQ5q-0005l6-KE for 66689@debbugs.gnu.org; Fri, 27 Oct 2023 12:53:55 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 13991f4c; Fri, 27 Oct 2023 16:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=Sin1Btr3ctjRBJGOS+I5dUI4Qyg=; b=C Q8bDEH9BVn6Oq2C4IoneneH9oEgu4LSgT78Zw1OS7FMQU9xzNlXOzpvdse6cZGBl SoQoulOttaW5VuGZ7dwHCor0diatAvuJccHoQfdaTsfw3OFm0VoZ0qJLlt7ZT4RW BaV2Cb5vPc8zO3d1LTzoKI+NXOALChYMcH1jrCBXpBj1HLjyZEv/79fZN1YfbfL8 d68AZbsDHEWx1hC0+H2dSqzJU21r1JJNXOKafipG0tUVdpAt0ppMq4SGrLzVFp0t ZhgMF1GbWhWtP9g3fG5VoBjejSiBmPzZaiTI/6qPQutoQaBO/2DDEhwaVUcC+I3/ wYwf1repy5sbn2CnCnsxQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 75b72b3f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Fri, 27 Oct 2023 16:53:22 +0000 (UTC) Message-ID: <2163cea68cc7d57b82d0934a3b4d3d179005cc4a.1698425112.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Fri, 27 Oct 2023 18:42:06 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/glib.scm (python-pygobject) [origin sha256]: Update indentation. [snippet]: Convert to G-Expression. Remove trailing #f. [arguments]: Convert to list of G-Expressions. [native-inputs]: Drop labels. Change-Id: I325de196b79cbdd0acaed3c40be42aa7335abcae --- gnu/packages/glib.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2c813fd594..1012d2190b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1015,33 +1015,31 @@ (define-public python-pygobject (version-major+minor version) "/pygobject-" version ".tar.xz")) (sha256 - (base32 - "1z6aagb46fhhdd0bb3zk6dfdw3s4y2fva0vv3jpwjj6mvar0hq22")) + (base32 "1z6aagb46fhhdd0bb3zk6dfdw3s4y2fva0vv3jpwjj6mvar0hq22")) (modules '((guix build utils))) (snippet - '(begin - ;; We disable these tests in a snippet so that they are inherited - ;; by the Python 2 variant which is built differently. - (with-directory-excursion "tests" - ;; FIXME: These tests require Gdk and/or Gtk 4. - (for-each delete-file - '("test_atoms.py" "test_overrides_gtk.py" - "test_overrides_gdk.py")) - #t))))) + ;; We disable these tests in a snippet so that they are inherited + ;; by the Python 2 variant which is built differently. + #~(with-directory-excursion "tests" + ;; FIXME: These tests require Gdk and/or Gtk 4. + (for-each delete-file + '("test_atoms.py" "test_overrides_gtk.py" + "test_overrides_gdk.py")))))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; The default 90 seconds can be too low on slower machines. - (invoke "meson" "test" "--timeout-multiplier" "5"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; The default 90 seconds can be too low on slower machines. + (invoke "meson" "test" "--timeout-multiplier" "5"))))))) (native-inputs - `(("glib-bin" ,glib "bin") - ("pkg-config" ,pkg-config) - ("python-pytest" ,python-pytest) - ("python-wrapper" ,python-wrapper))) ; For patching shebangs + (list `(,glib "bin") + pkg-config + python-pytest + python-wrapper)) ; For patching shebangs (inputs (list python python-pycairo gobject-introspection)) (propagated-inputs