From patchwork Thu May 9 22:53:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 27301 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 9BA3227BBF4; Thu, 9 May 2024 23:59:16 +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 850DD27BBE9 for ; Thu, 9 May 2024 23:59:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5ChN-0005t5-DD; Thu, 09 May 2024 18:57:13 -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 1s5ChK-0005rl-5j for guix-patches@gnu.org; Thu, 09 May 2024 18:57: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 1s5ChJ-0006R8-TQ for guix-patches@gnu.org; Thu, 09 May 2024 18:57:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5ChI-0002fG-7T for guix-patches@gnu.org; Thu, 09 May 2024 18:57:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70855] [PATCH 16/92] gnu: qtile: Update to 0.23.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 22:57:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70855@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70855-submit@debbugs.gnu.org id=B70855.17152953979891 (code B ref 70855); Thu, 09 May 2024 22:57:08 +0000 Received: (at 70855) by debbugs.gnu.org; 9 May 2024 22:56:37 +0000 Received: from localhost ([127.0.0.1]:41071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Cgm-0002ZN-Hb for submit@debbugs.gnu.org; Thu, 09 May 2024 18:56:37 -0400 Received: from 2.mo575.mail-out.ovh.net ([46.105.52.162]:60921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Cgi-0002Yq-FJ for 70855@debbugs.gnu.org; Thu, 09 May 2024 18:56:34 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.25.157]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4Vb6nr5Wxvz1RrG for <70855@debbugs.gnu.org>; Thu, 9 May 2024 22:56:32 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-lmjrs (unknown [10.111.182.47]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 69E031FDF3; Thu, 9 May 2024 22:56:32 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-lmjrs with ESMTPSA id VwgCEqBUPWbLQAAAamcrRw (envelope-from ); Thu, 09 May 2024 22:56:32 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002853afb09-2132-4876-a0dc-92257e519a99, E63BAB6C0A71DD4DA934779D5D345DF804807214) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Fri, 10 May 2024 00:53:11 +0200 Message-ID: <20240509225530.24649-16-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240509225530.24649-1-ngraves@ngraves.fr> References: <20240509225530.24649-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6097873897637208802 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 10 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeffedgudehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdluddtmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhudeiueduvdeguddtteejveefhefgudegleeljeejgedvveekjefgheehveetjeenucffohhmrghinhepqhhtihhlvgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtkeehheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht 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/wm.scm (qtile): Update to 0.23.0. [build-system]: Upgrade to pyproject-build-system. [arguments]<#:phases>: Use gexp (but do not indent). Add phase pre-check. <#:test-flags>: Use it. [native-inputs]: Add python-pytest and xorg-server-for-tests. Reorder. Change-Id: Id6f291c0d23fa2cef17d6e45552f45c56f162741 --- gnu/packages/wm.scm | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f2cb77f5bfd..3ae4d03839b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -63,7 +63,7 @@ ;;; Copyright © 2023 Gabriel Wicki ;;; Copyright © 2023 Jonathan Brielamier ;;; Copyright © 2023 Vessel Wave -;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023, 2024 Nicolas Graves ;;; Copyright © 2023, 2024 Jaeme Sifat ;;; Copyright © 2023 Josselin Poiret ;;; Copyright © 2024 Timotej Lazar @@ -101,6 +101,7 @@ (define-module (gnu packages wm) #:use-module (guix build-system haskell) #:use-module (guix build-system meson) #:use-module (guix build-system perl) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix utils) @@ -594,19 +595,22 @@ (define-public python-i3-py (define-public qtile (package (name "qtile") - (version "0.18.1") + (version "0.23.0") (source (origin (method url-fetch) (uri (pypi-uri "qtile" version)) (sha256 - (base32 "14hb26xkza7brvkd4276j60mxd3zsas72ih6y0cq3j060izm1865")))) - (build-system python-build-system) + (base32 "1v8rxm2xg2igxv6gwa78wrkxzgfxmxfgflbjdp4fm7cxjdx3zrpa")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ; Tests require Xvfb and writable temp/cache space - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths + (list + ;; A lot of tests fail despite Xvfb and writable temp/cache space. + #:tests? #f + #:test-flags '("--ignore=test/widgets/test_widget_init_configure.py") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "libqtile/pangocffi.py" (("^gobject = ffi.dlopen.*") @@ -626,7 +630,14 @@ (define-public qtile (mkdir-p xsessions) (copy-file "resources/qtile.desktop" (string-append xsessions "/qtile.desktop")) (substitute* (string-append xsessions "/qtile.desktop") - (("qtile start") qtile)))))))) + (("qtile start") qtile))))) + (add-before 'check 'pre-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (setenv "XDG_CACHE_HOME" "/tmp"))))))) (inputs (list glib pango pulseaudio)) (propagated-inputs @@ -643,9 +654,11 @@ (define-public qtile (list pkg-config python-flake8 python-pep8-naming - python-psutil + python-pytest python-pytest-cov - python-setuptools-scm)) + python-psutil + python-setuptools-scm + xorg-server-for-tests)) (home-page "http://qtile.org") (synopsis "Hackable tiling window manager written and configured in Python") (description "Qtile is simple, small, and extensible. It's easy to write