unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Giacomo Leidi via Guix-patches via <guix-patches@gnu.org>
To: 66886@debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul@autistici.org>
Subject: [bug#66886] [PATCH v4 3/6] gnu: python-rich: Update to 13.7.0.
Date: Mon, 15 Jan 2024 00:59:35 +0100	[thread overview]
Message-ID: <20240114235938.24529-3-goodoldpaul@autistici.org> (raw)
In-Reply-To: <20240114235938.24529-1-goodoldpaul@autistici.org>

* 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")
-- 
2.41.0





  parent reply	other threads:[~2024-01-15  0:00 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-01 16:58 [bug#66886] Update python-textual to 0.41 paul via Guix-patches via
2023-11-01 17:01 ` [bug#66886] [PATCH 1/5] gnu: Add python-pygments-2.16 Giacomo Leidi via Guix-patches via
2023-11-01 17:01   ` [bug#66886] [PATCH 2/5] gnu: python-markdown-it-py: Update to 3.0.0 Giacomo Leidi via Guix-patches via
2023-11-01 17:01   ` [bug#66886] [PATCH 3/5] gnu: python-rich: Update to 13.6.0 Giacomo Leidi via Guix-patches via
2023-11-01 17:01   ` [bug#66886] [PATCH 4/5] gnu: python-mdit-py-plugins: Update to 0.4.0 Giacomo Leidi via Guix-patches via
2023-11-01 17:01   ` [bug#66886] [PATCH 5/5] gnu: python-textual: Update to 0.41.0 Giacomo Leidi via Guix-patches via
2023-11-02  0:14   ` jgart via Guix-patches via
2023-11-16 23:55     ` paul via Guix-patches via
2023-11-18  2:44     ` jgart via Guix-patches via
2023-12-03 15:21       ` paul via Guix-patches via
2023-12-29 22:07         ` paul via Guix-patches via
2024-01-14 23:54           ` paul via Guix-patches via
2024-02-27 18:42             ` paul via Guix-patches via
2024-02-27 18:42               ` bug#66886: " paul via Guix-patches via
2023-11-16 23:54 ` [bug#66886] [PATCH v2 1/5] gnu: Add python-pygments-2.16 Giacomo Leidi via Guix-patches via
2023-11-16 23:54   ` [bug#66886] [PATCH v2 2/5] gnu: python-markdown-it-py: Update to 3.0.0 Giacomo Leidi via Guix-patches via
2023-11-16 23:54   ` [bug#66886] [PATCH v2 3/5] gnu: python-rich: Update to 13.7.0 Giacomo Leidi via Guix-patches via
2023-11-16 23:54   ` [bug#66886] [PATCH v2 4/5] gnu: python-mdit-py-plugins: Update to 0.4.0 Giacomo Leidi via Guix-patches via
2023-11-16 23:54   ` [bug#66886] [PATCH v2 5/5] gnu: python-textual: Update to 0.41.0 Giacomo Leidi via Guix-patches via
2023-12-03 15:22 ` [bug#66886] [PATCH v3 1/6] gnu: Add python-pygments-2.16 Giacomo Leidi via Guix-patches via
2023-12-03 15:22   ` [bug#66886] [PATCH v3 2/6] gnu: python-markdown-it-py: Update to 3.0.0 Giacomo Leidi via Guix-patches via
2023-12-03 15:22   ` [bug#66886] [PATCH v3 3/6] gnu: python-rich: Update to 13.7.0 Giacomo Leidi via Guix-patches via
2023-12-03 15:22   ` [bug#66886] [PATCH v3 4/6] gnu: python-jupytext: Update to 1.15.2 Giacomo Leidi via Guix-patches via
2023-12-03 15:22   ` [bug#66886] [PATCH v3 5/6] gnu: python-mdit-py-plugins: Update to 0.4.0 Giacomo Leidi via Guix-patches via
2023-12-03 15:22   ` [bug#66886] [PATCH v3 6/6] gnu: python-textual: Update to 0.41.0 Giacomo Leidi via Guix-patches via
2024-01-14 23:59 ` [bug#66886] [PATCH v4 1/6] gnu: Add python-pygments-2.16 Giacomo Leidi via Guix-patches via
2024-01-14 23:59   ` [bug#66886] [PATCH v4 2/6] gnu: python-markdown-it-py: Update to 3.0.0 Giacomo Leidi via Guix-patches via
2024-01-14 23:59   ` Giacomo Leidi via Guix-patches via [this message]
2024-01-14 23:59   ` [bug#66886] [PATCH v4 4/6] gnu: python-jupytext: Update to 1.15.2 Giacomo Leidi via Guix-patches via
2024-01-14 23:59   ` [bug#66886] [PATCH v4 5/6] gnu: python-mdit-py-plugins: Update to 0.4.0 Giacomo Leidi via Guix-patches via
2024-01-14 23:59   ` [bug#66886] [PATCH v4 6/6] gnu: python-textual: Update to 0.47.1 Giacomo Leidi via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240114235938.24529-3-goodoldpaul@autistici.org \
    --to=guix-patches@gnu.org \
    --cc=66886@debbugs.gnu.org \
    --cc=goodoldpaul@autistici.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).