From patchwork Fri Dec 1 23:09:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 57203 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 DB89527BBE2; Sat, 2 Dec 2023 10:54:06 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 D7FB416D21 for ; Sat, 2 Dec 2023 10:54:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9NdE-0005nA-26; Sat, 02 Dec 2023 05:53:56 -0500 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 1r9NdC-0005lp-0u for guix-patches@gnu.org; Sat, 02 Dec 2023 05:53:54 -0500 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 1r9NdB-0006mw-PD for guix-patches@gnu.org; Sat, 02 Dec 2023 05:53:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9NdK-00065M-QU; Sat, 02 Dec 2023 05:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67582] [PATCH gnome-team 3/4] gnu: python-dbusmock: Update to 0.30.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 10:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67582@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 67582-submit@debbugs.gnu.org id=B67582.170151442623342 (code B ref 67582); Sat, 02 Dec 2023 10:54:02 +0000 Received: (at 67582) by debbugs.gnu.org; 2 Dec 2023 10:53:46 +0000 Received: from localhost ([127.0.0.1]:56737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Nd4-00064N-9G for submit@debbugs.gnu.org; Sat, 02 Dec 2023 05:53:46 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:48514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Nd1-00063o-0C for 67582@debbugs.gnu.org; Sat, 02 Dec 2023 05:53:43 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-9fa2714e828so420252866b.1 for <67582@debbugs.gnu.org>; Sat, 02 Dec 2023 02:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701514408; x=1702119208; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=qJo7vPScONLH8wQO03dWv0s79uGZTNOZzOIiVL3V5ls=; b=Ya+nSZfKUPByHMJubKnghqIlD8mw7ZmXf7GSuEfXDU4cQEyTTul7q34kUD4YKsWEwk 5CXfpiZSX6TDlwb2K/nJSs4amE4j526F49P3lJTKcjOsFN+FtBA49OJw3UzpKA3oeVEZ VgXNFFBZyWK6UYMe55seKDD8iz0Q2gV8z4tDxYySKuIt1wnuMlm9VD7kQZFnry91NOWp SmyRAiS8DKv5DARMpmuA5TONNI7U58Col+6aLSJW2xBEXa2lOtMRKwS7YxXOPpLUn08n pBKkPr6MmF3aly4wiJbnqKuiL2XTYRfXhYp5BfG6Puzd5b12SNdUo91mbRYD/Eic2hK2 wACg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701514408; x=1702119208; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qJo7vPScONLH8wQO03dWv0s79uGZTNOZzOIiVL3V5ls=; b=vSsTRTmEi5x2I81LjLGjye2WNrE/c1pMfOPp/vyO5/PObe3tczUM90pm9wsOA2rq7P v7FDh0PJaNSpj6pCETK5eMeAoO3sb33KqI6lwYV1mYhFUS7tm0GvFiy4Ul0Heg7HGEaw SZ1kqo7N7RVLm50v5EXfJN9HjTmR34VZHsK7rTkOBkIKZN4ZSSD6ki9HoMcFTc6p0dA0 ZaaMqM9l2X/FQ+rY+6kwl8HErbYiZAdnGd5J8BAvhGrfgItwX54eYbM2LL/PKqfDfTcK 4pqwbL6kHtEigvNokvWXuPkR4mVq5JQwiGuH/nVvG6p9SjCxkgll5SaYfOcLu7ZLeG+3 TDJw== X-Gm-Message-State: AOJu0YxAsTWLR82Nkx0mcqBYJFzBKyOgVAIDpPQI6NfF+YwyXFei1cH7 5LD7M3/5Ab+NCBW2WN6vB2eQc1GQjrPX2Q== X-Google-Smtp-Source: AGHT+IHsj5S3eR6tOI4PlRKtmuCz9K1/9N2P8Kiu+OBGS/kqpB3DIhuy2p8YYFRsf+gdGqI2vuJceg== X-Received: by 2002:a17:906:c8:b0:a19:8831:d766 with SMTP id 8-20020a17090600c800b00a198831d766mr949783eji.3.1701514407953; Sat, 02 Dec 2023 02:53:27 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qb29-20020a1709077e9d00b00a19084099a4sm2563001ejc.16.2023.12.02.02.53.27 for <67582@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 02:53:27 -0800 (PST) Message-ID: <75681c8791607557c6fdeaa2c6ce0d66181caf49.1701513359.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 2 Dec 2023 00:09:47 +0100 MIME-Version: 1.0 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: , 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-dbusmock): Update to 0.30.0. [#:phases]: Adjust accordingly. [native-inputs]: Add upower. (python-dbus-minimal): New variable. * gnu/packages/gnome.scm (upower)[native-inputs]: Replace python-dbusmock with python-dbusmock-minimal. * gnu/packages/gtk.scm (at-spi2-core)[native-inputs]: Likewise. (at-spi2-core-with-documentation)[native-inputs]: Adjust accordingly. * gnu/packages/polkit.scm (polkit)[native-inputs]: Replace python-dbusmock with python-dbusmock-minimal. Change-Id: If0cd76da0495d052f94ee5d654436c4d1dd1e2c3 --- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 5 +++-- gnu/packages/polkit.scm | 2 +- gnu/packages/python-xyz.scm | 21 +++++++++++++++++---- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 900869a80c..07944b7a3e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5810,7 +5810,7 @@ (define-public upower python ;; For tests. python-dbus - python-dbusmock + python-dbusmock-minimal python-packaging python-pygobject umockdev diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b5246c8b3b..761b65fd1f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -849,7 +849,7 @@ (define-public at-spi2-core gobject-introspection gsettings-desktop-schemas pkg-config - python-dbusmock + python-dbusmock-minimal python-pytest python-wrapper)) (synopsis "Assistive Technology Service Provider Interface, core components") @@ -880,7 +880,8 @@ (define-public at-spi2-core-with-documentation "/share/doc'\n"))))))))) (native-inputs (modify-inputs (package-native-inputs at-spi2-core) - (append gi-docgen python python-sphinx))) + (append gi-docgen python python-sphinx) + (replace "python-dbusmock" python-dbusmock))) (properties (alist-delete 'hidden? (package-properties at-spi2-core))))) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 2f733dd703..337d9b9a73 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -158,7 +158,7 @@ (define-public polkit perl pkg-config python - python-dbusmock)) + python-dbusmock-minimal)) (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3e23311b80..c079efe7ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27338,14 +27338,14 @@ (define-public python-dbus-python (define-public python-dbusmock (package (name "python-dbusmock") - (version "0.25.0") + (version "0.30.0") (source (origin (method url-fetch) (uri (pypi-uri "python-dbusmock" version)) (sha256 (base32 - "1nwl0gzzds2g1w1gfxfzlgrkb5hr1rrdyn619ml25c6b1rjyfk3g")))) + "1hanz6x76jq66ypdirga5h15zjs67kwysl6rmsf0i22dbdqrxdfv")))) (build-system python-build-system) (arguments (list #:modules `((guix build python-build-system) @@ -27356,6 +27356,9 @@ (define-public python-dbusmock #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/test_api.py" + (("/usr/bin/python3") + (which "python3"))) (substitute* "tests/test_code.py" (("/bin/bash") (which "bash"))) @@ -27382,11 +27385,11 @@ (define-public python-dbusmock status)) (loop))))))))))))) (native-inputs - (list dbus python-pytest which)) + (list dbus python-pytest upower which)) (inputs (list dbus)) (propagated-inputs - (list python-dbus python-pygobject)) + (list python-dbus-python python-pygobject)) (home-page "https://github.com/martinpitt/python-dbusmock") (synopsis "Python library for mock D-Bus objects") (description "python-dbusmock allows for the easy creation of mock objects on @@ -27396,6 +27399,16 @@ (define-public python-dbusmock services to what you expect in your tests.") (license license:lgpl3+))) +(define-public python-dbusmock-minimal + (package + (inherit python-dbusmock) + (name "python-dbusmock-minimal") + (arguments + (substitute-keyword-arguments (package-arguments python-dbusmock) + ((#:tests? _ #t) #f))) + (native-inputs (list which)) + (properties '((hidden? . #t))))) + (define-public python-jsonplus (package (name "python-jsonplus")