From patchwork Sun Jan 14 23:59:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 58881 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 AE5D427BBE2; Mon, 15 Jan 2024 00:00:35 +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_H5,RCVD_IN_MSPIKE_WL, 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 1236027BBE9 for ; Mon, 15 Jan 2024 00:00:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPAOj-0007i2-IA; Sun, 14 Jan 2024 19:00:13 -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 1rPAOf-0007eB-Sq for guix-patches@gnu.org; Sun, 14 Jan 2024 19:00:10 -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 1rPAOf-0000ld-AU for guix-patches@gnu.org; Sun, 14 Jan 2024 19:00:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPAOc-0002ZY-LK for guix-patches@gnu.org; Sun, 14 Jan 2024 19:00:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66886] [PATCH v4 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: Mon, 15 Jan 2024 00:00:06 +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.17052767949537 (code B ref 66886); Mon, 15 Jan 2024 00:00:06 +0000 Received: (at 66886) by debbugs.gnu.org; 14 Jan 2024 23:59:54 +0000 Received: from localhost ([127.0.0.1]:44299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAOP-0002Te-DM for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:59:53 -0500 Received: from confino.investici.org ([93.190.126.19]:24095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAON-0002Su-D4 for 66886@debbugs.gnu.org; Sun, 14 Jan 2024 18:59:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1705276791; bh=MkmIGEnWJwCXialgLiCBbVZh1O0oZSzkUfrJnmmSDT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pRcvraDGYCtEUpNTwvks6PobjZUgJ16eyP2Ox6Zh7Ltj62McJ3fzctEFTA+perXTn GBe7aw3EvKfviTuI+piv+cqRSQc20QLWBhWlZDcPMIIVtBRzKveIfnrDPhPn3yi5uR srxRdjnW/vmP8+FbwMVRJCksHuXl9WS9G1Xdr42E= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TCshR2Z2Xz1117; Sun, 14 Jan 2024 23:59:51 +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 4TCshR1J57z10yK; Sun, 14 Jan 2024 23:59:51 +0000 (UTC) Date: Mon, 15 Jan 2024 00:59:35 +0100 Message-ID: <20240114235938.24529-3-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240114235938.24529-1-goodoldpaul@autistici.org> References: <20240114235938.24529-1-goodoldpaul@autistici.org> 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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: Giacomo Leidi 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/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 f75254ed9f..60d0dc6f8f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12512,7 +12512,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 567b01f396..74ec405a94 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1208,7 +1208,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 a0ad12a29f..cef458e0fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7205,7 +7205,7 @@ (define-public pelican python-feedgenerator python-jinja2 python-markdown - python-pygments + python-pygments-2.16 python-pytz python-rich python-unidecode)) @@ -18585,49 +18585,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")