From patchwork Mon Dec 12 14:26:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 45207 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 463F027BBEC; Mon, 12 Dec 2022 14:29:50 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 A512327BBEB for ; Mon, 12 Dec 2022 14:29:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4jms-0005Zj-60; Mon, 12 Dec 2022 09:28:10 -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 1p4jml-0005TF-89 for guix-patches@gnu.org; Mon, 12 Dec 2022 09:28:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4jmk-0006CK-WE for guix-patches@gnu.org; Mon, 12 Dec 2022 09:28:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4jmk-0007UO-EE for guix-patches@gnu.org; Mon, 12 Dec 2022 09:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60009] [PATCH 01/18] gnu: python-graphviz: Update to 0.20.1. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Dec 2022 14:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60009@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 60009-submit@debbugs.gnu.org id=B60009.167085524828640 (code B ref 60009); Mon, 12 Dec 2022 14:28:02 +0000 Received: (at 60009) by debbugs.gnu.org; 12 Dec 2022 14:27:28 +0000 Received: from localhost ([127.0.0.1]:53259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4jmC-0007Rr-0k for submit@debbugs.gnu.org; Mon, 12 Dec 2022 09:27:28 -0500 Received: from sender3-of-o58.zoho.com ([136.143.184.58]:21870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4jm9-0007Rj-7T for 60009@debbugs.gnu.org; Mon, 12 Dec 2022 09:27:26 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1670855242; cv=none; d=zohomail.com; s=zohoarc; b=cjk/MOEtBjh/aHBs2lGXyYrh4a+tqaD9Pmjlbut3NSxgQZK/W6wn6pKmGUgJ7peQgsdwnWeFz0yKgEnBffsYj4vRbwKm7Sbe4EXb4+5E1HYoe8eWxSpE9mXViCx9LGuDE6xv8PT07XjSjXorHzQHe8QrdDvicAoDvSE2twJ2IXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670855242; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=yfCKehxFPZ1Un8hoFSr41sQWA4LoHiLvoWgWnCIYWLo=; b=FeUQDZ+SjEwAZugI9ysAIh2E56eM85lsQNRgx7Z2cothhFCkMilkpcHvqLYZXyBO625JmjC/DC50AqSIdil3mVEQk056pmP3o4UB1sGv+Av1lsj+MqFcUIzTeegfe7OxQqvEJqGwnucFWJbbEhMSL/36pmnrfDjmdg2hNzDXcbI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1670855242; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Reply-To; bh=yfCKehxFPZ1Un8hoFSr41sQWA4LoHiLvoWgWnCIYWLo=; b=fvNPIvW06+phmrysTlMDZdnNB3lb6ZtmPviDrfbYP/KqG6IThIN7lTmEsxIIiW8Z HXvDidlUmXEZsVs/5+E5JGzdkiKNvHs75qE8vf0a249At7b3zJzI5p02ADrHqY9SaVK WTdidiZ/2qO7SSRyOV4lK8iKeGLkFmKIZN6kBx3Y= Received: from localhost (48-111-142-46.pool.kielnet.net [46.142.111.48]) by mx.zohomail.com with SMTPS id 1670855240611673.6031872565396; Mon, 12 Dec 2022 06:27:20 -0800 (PST) From: Ricardo Wurmus Date: Mon, 12 Dec 2022 15:26:59 +0100 Message-Id: <20221212142716.9460-1-rekado@elephly.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <87h6y03dkr.fsf@elephly.net> References: <87h6y03dkr.fsf@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External 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/graphviz.scm (python-graphviz): Update to 0.20.1. [build-system]: Use pyproject-build-system. [arguments]: Remove custom "check" phase; add "prepare-check" phase. [native-inputs]: Remove python-mock. --- gnu/packages/graphviz.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 51c1de3932..7c2cb1eae0 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015, 2021 Ludovic Courtès ;;; Copyright © 2015, 2020 Efraim Flashner ;;; Copyright © 2016 Theodoros Foradis -;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2019, 2022 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2018 Mathieu Lirzin @@ -32,6 +32,7 @@ (define-module (gnu packages graphviz) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -180,27 +181,25 @@ (define-public graphviz-2.38 (define-public python-graphviz (package (name "python-graphviz") - (version "0.13.2") + (version "0.20.1") (source (origin (method url-fetch) (uri (pypi-uri "graphviz" version ".zip")) (sha256 (base32 - "009alrilzx0v7kl41khbq7k6k8b8pxyvbsi1b1ai933f6kpbxb30")))) - (build-system python-build-system) + "1y1b956r01kg7qarkkrivhn71q64k0gbq6bcybd4gfd3v95g2n4c")))) + (build-system pyproject-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests #:allow-other-keys) - (if tests - (invoke "pytest" "-vv") - (format #t "test suite not run~%")) - #t))))) + (list + #:phases + '(modify-phases %standard-phases + (add-before 'check 'prepare-chec + ;; Needed for fontconfig cache directories + (lambda _ (setenv "HOME" (getcwd))))))) (native-inputs (list unzip ;; For tests. graphviz - python-mock python-pytest python-pytest-cov python-pytest-mock))