From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id CHKhB7SdbGWJQAEA9RJhRA:P1 (envelope-from ) for ; Sun, 03 Dec 2023 16:24:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CHKhB7SdbGWJQAEA9RJhRA (envelope-from ) for ; Sun, 03 Dec 2023 16:24:36 +0100 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 D9E44112D4 for ; Sun, 3 Dec 2023 16:24:35 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b="H+8O/RtT"; 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=1701617076; a=rsa-sha256; cv=none; b=ajSqzgyouwytPeEOpesHJFgr7wGEq7iZ549Se5iXIf6hdSvJeN2AKhfs15feF945LEvEGp L8tr9+8jPwNqV17M1hBUxk4uQYwKGjM7ZTk8KLd9lKSXFNrnHWGvAEz9+Op++ARF9DdN8P Tjf/81BMr+jan6IVFUlyuzRD3MaYnYjwjft3x3I5mQuLn6VF8UPGc9hlNbyFya1GzfCzHw MgzOc0xuOEm2PkXg5ncX8aNjoaCcakiSSh459BzHlNYDEiXxYEqZSx3M3kcPJUsTTG/4LL le+kuQRAx5JXNR4KwjgCzWAy5M9o4xfGsjP+1AEvRcEYZ9dpXkcRL8IwfTUVJQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b="H+8O/RtT"; 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=1701617076; 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:dkim-signature; bh=aVM8CkvN2spMORjZVymza/+i8RenwednAwgzbFy2luI=; b=JDiDWwKrmn6DXSGiE6jlYp1XEXveu9EVS33JCzDLvYsm8oW4vJb6JeDHhNxpXN8MAzcH+U mW4T7znLgfonCnRtOIeyaDB132fCWKyPyQ56GGxkBth3BB3uPEyiGuV2HhFcQ9G6SpALLm ZYo8bHDhxEBX3j/bUsNxx4PZrK4xls7z3SvXnLMUkZdZR1Z5T0PrySkYOlyNedzcYE/21N mUbO5K+RYzVIDBtzrIxFHHidFPlOeyqzij72rtqyoQNpsChLl1UGfHlPmlM/Qdswl+nik6 67jg0Cu0kS7O/IX1p5UIiO/wkfqyJ49tfAg/t3myQt2LUK3vHc4CqTu4WpPV/g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9oK7-0002dX-Bc; Sun, 03 Dec 2023 10:23:59 -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 1r9oK1-0002bt-RM for guix-patches@gnu.org; Sun, 03 Dec 2023 10:23:53 -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 1r9oK1-0004Qe-Ep for guix-patches@gnu.org; Sun, 03 Dec 2023 10:23:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9oKB-0003iZ-Db for guix-patches@gnu.org; Sun, 03 Dec 2023 10:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66886] [PATCH v3 3/6] gnu: python-rich: Update to 13.7.0. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Dec 2023 15:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 66886@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 66886-submit@debbugs.gnu.org id=B66886.170161700914213 (code B ref 66886); Sun, 03 Dec 2023 15:24:03 +0000 Received: (at 66886) by debbugs.gnu.org; 3 Dec 2023 15:23:29 +0000 Received: from localhost ([127.0.0.1]:60619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9oJc-0003h5-Ci for submit@debbugs.gnu.org; Sun, 03 Dec 2023 10:23:28 -0500 Received: from confino.investici.org ([2a11:7980:1::2:0]:20923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9oJa-0003gJ-44 for 66886@debbugs.gnu.org; Sun, 03 Dec 2023 10:23:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1701616995; bh=aVM8CkvN2spMORjZVymza/+i8RenwednAwgzbFy2luI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H+8O/RtTKIkjt1R6AnD8Ktf5B7G8qtyM+IzUYEghQVHzFEZ1UwUIhYf58Q+1oYOP2 tyZymGubov95xhbEjY2jo8eVCxFKZalXh/XOL1R2UKs69+KTt1wKzK0xM8TWeiOnvJ wcaQlKCRLQBM+O885fsvL2dYMvSpRGJax3HjHQhM= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4SjrCl4CMDz119f; Sun, 3 Dec 2023 15:23:15 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4SjrCl33Jtz10yx; Sun, 3 Dec 2023 15:23:15 +0000 (UTC) Date: Sun, 3 Dec 2023 16:22:55 +0100 Message-ID: <20231203152258.1793-3-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231203152258.1793-1-goodoldpaul@autistici.org> References: <20231203152258.1793-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches From: Giacomo Leidi 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-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.25 X-Spam-Score: -6.25 X-Migadu-Queue-Id: D9E44112D4 X-TUID: V4NrXwiWror8 * gnu/packages/bioinformatics.scm (multiqc)[propagated-inputs]: Use python-rich-12.4. * gnu/packages/python-xyz.scm (python-rich): Update to 13.7.0; [source]: switch to git-origin to have tests; [build-system]: switch to pyproject-build-system; [arguments]: remove it since this boilerplate is now handled by the pyproject-build-system; [propagated-inputs]: remove python-colorama as it's not listed on pyproject.toml; replace python-commonmark with python-markdown-it-py; use python-pygments-2.16; move python-attrs from here...; [native-inputs]: ...to here; drop "tests" input; add python-pytest-cov; [home-page]: https://github.com/willmcgugan/rich now redirects to https://github.com/Textualize/rich ; (python-rich-12.4): new variable; (pelican)[propagated-inputs]: use python-pygments-2.16. * gnu/packages/python-web.scm (httpie)[propagated-inputs]: Use python-pygments-2.16. Change-Id: I16ea6f27d24f84d86db659c224705c81fac3b42e --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 64 ++++++++++++++++----------------- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a414a58382..63a58f1e26 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11938,7 +11938,7 @@ (define-public multiqc python-numpy python-pyyaml python-requests - python-rich + python-rich-12.4 python-rich-click python-simplejson python-spectra)) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9d8f3c156f..ab36d2ce28 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1175,7 +1175,7 @@ (define-public httpie '(#:tests? #f)) (propagated-inputs (list python-colorama - python-pygments + python-pygments-2.16 python-requests python-requests-toolbelt python-pysocks diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a238764b14..7b96576810 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7182,7 +7182,7 @@ (define-public pelican python-feedgenerator python-jinja2 python-markdown - python-pygments + python-pygments-2.16 python-pytz python-rich python-unidecode)) @@ -18216,49 +18216,47 @@ (define-public python-slugid (define-public python-rich (package (name "python-rich") - (version "12.4.1") + (version "13.7.0") (source (origin - (method url-fetch) - (uri (pypi-uri "rich" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Textualize/rich") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "149vjb4cpf9mz14iig0b6d8065dm8aslp6pc45g9ipmp1wf00ffj")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (copy-recursively (string-append - (assoc-ref inputs "tests") "/tests") - "tests") - (invoke "python" "-m" "pytest" "-vv"))))))) + "0qyhw2vvk17qdmfrmi45z4dd0fkwx3l2qrf3iy0yc2y7pfgrmg9g")))) + (build-system pyproject-build-system) (propagated-inputs - (list python-attrs python-colorama python-commonmark python-pygments - python-typing-extensions)) + (list python-markdown-it-py python-pygments-2.16 python-typing-extensions)) (native-inputs - `(("python-pytest" ,python-pytest) - ("tests" - ;; The release on pypi comes without tests. We can't build from this - ;; checkout, though, because installation requires an invocation of - ;; poetry. - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/willmcgugan/rich") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9")))))) - (home-page "https://github.com/willmcgugan/rich") + (list poetry python-attr python-pytest python-pytest-cov)) + (home-page "https://github.com/Textualize/rich") (synopsis "Render rich text and more to the terminal") (description "This is a Python package for rendering rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal.") (license license:expat))) +(define-public python-rich-12.4 + (package + (inherit python-rich) + (version "12.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Textualize/rich") + (commit (string-append "v" version)))) + (file-name (git-file-name "python-rich" version)) + (sha256 + (base32 + "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9")))) + (propagated-inputs + (list python-colorama + python-commonmark + python-pygments + python-typing-extensions)))) + (define-public python-rich-click (package (name "python-rich-click") -- 2.41.0