From patchwork Sun Jan 14 23:56:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 58870 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 65F0E27BBEA; Sun, 14 Jan 2024 23:57:31 +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=unavailable 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 83E8D27BBE2 for ; Sun, 14 Jan 2024 23:57:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPALh-0006ce-8Z; Sun, 14 Jan 2024 18:57:05 -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 1rPALf-0006c5-Nu for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:03 -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 1rPALf-0008Rp-FM for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPALe-0002M7-Oi for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68456] [PATCH v4 1/6] gnu: Add python-pygments-2.16. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jan 2024 23:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68456 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68456@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17052765898941 (code B ref -1); Sun, 14 Jan 2024 23:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 23:56:29 +0000 Received: from localhost ([127.0.0.1]:44252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAL6-0002K9-RM for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:29 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAL5-0002Jj-H3 for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:27 -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 1rPAKz-0006ZI-SQ for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:21 -0500 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPAKw-0008I4-VR for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1705276577; bh=AWqYwZRTgdIOwx9jYgp1v6kZO57Bm7eG77PbRVkN+Ds=; h=From:To:Cc:Subject:Date:From; b=XDmGwZT7VNxjcTI4SOizbwkfVzYZg41BZjb4mTXmSWj3kKYo5AmUHa5Ct+4mDWCMj FpqCDebFasYlCwP8ZByrOXz6paPcgTt6KKR1iB6R8x38Lhm/1KKw6qq0hJCg5TrBW5 lwttpybySbrtRPZ7TOnmhkkYW7aQN2ntyyRm9ENA= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TCscK1jDwz10yP; Sun, 14 Jan 2024 23:56:17 +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 4TCscK0Yg0z10yK; Sun, 14 Jan 2024 23:56:17 +0000 (UTC) Date: Mon, 15 Jan 2024 00:56:04 +0100 Message-ID: <20240114235609.24296-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 This patch has also been sent to the python-team branch with bug #66884. * gnu/packages/python-xyz.scm (python-pygments-2.16): New variable. Change-Id: I863fc1aaea9930991b6f92643befbde7ba1a335c --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) base-commit: bcc9cd1aaeb53c323b199623de4fafe8594d1a95 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 37d7dd0dd5..5f159c39d1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6202,6 +6202,27 @@ (define-public python-pygments "Pygments is a syntax highlighting package written in Python.") (license license:bsd-2))) +(define-public python-pygments-2.16 + (package + (inherit python-pygments) + (version "2.16.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Pygments" version)) + (sha256 + (base32 + "0abfx7n0mgpxk05f2kini3p78wsp1yi7lh0yjk49pii0914z1bqx")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; Some tests require sphinx, which depends on this, so we only run + ;; basic tests. + '(list "--ignore-glob=tests/*/*"))) + (native-inputs + (list python-pytest)))) + (define-public python-pygments-github-lexers (package (name "python-pygments-github-lexers") From patchwork Sun Jan 14 23:56:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 58871 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 52DDB27BBEC; Sun, 14 Jan 2024 23:57:37 +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 A075027BBE2 for ; Sun, 14 Jan 2024 23:57:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPALj-0006e1-RT; Sun, 14 Jan 2024 18:57:07 -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 1rPALi-0006dJ-Gl for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:06 -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 1rPALi-0008SL-8U for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPALh-0002N7-M8 for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68460] [PATCH v4 2/6] gnu: python-markdown-it-py: Update to 3.0.0. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jan 2024 23:57:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68460@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17052765969004 (code B ref -1); Sun, 14 Jan 2024 23:57:05 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 23:56:36 +0000 Received: from localhost ([127.0.0.1]:44265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPALD-0002L4-P5 for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:36 -0500 Received: from lists.gnu.org ([2001:470:142::17]:53584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAL8-0002Ju-NY for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:31 -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 1rPAL1-0006Zb-J7 for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:24 -0500 Received: from confino.investici.org ([2a11:7980:1::2:0]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPAKz-0008IP-Kc for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1705276577; bh=H3SprG1qRqFYbB8V6orPofXVsjr2F+G9P3OV4kSm+XY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NgYsZhEqGvV21ovO+20Hb2tPWp1Dj+/Ssw/0KNicMtP2HSsGP5jHgWzyuaiy3XN1h +L944uJR/jHcHtv3TFhcZK7wlk/zBs7iqBR9Z806Y4bDo7/fIJ5RrCkLBOEN7WZVoC 5zMskLegUqrL1H613jd77Dvx/OfWOd7oHkvDVwf0= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TCscK3sKBz110x; Sun, 14 Jan 2024 23:56:17 +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 4TCscK2BkMz10yK; Sun, 14 Jan 2024 23:56:17 +0000 (UTC) Date: Mon, 15 Jan 2024 00:56:05 +0100 Message-ID: <20240114235609.24296-2-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240114235609.24296-1-goodoldpaul@autistici.org> References: <20240114235609.24296-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a11:7980:1::2:0; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/python-xyz.scm (python-markdown-it-py): Update to 3.0.0; (python-markdown-it-py-2.1): new variable. * gnu/packages/sphinx.scm (python-myst-parser)[propagated-inputs]: Use python-markdown-it-py-2.1. Change-Id: I009ad2fd7cd314e2073621f2cbe00ff97cb7e63c --- gnu/packages/python-xyz.scm | 15 +++++++++++++-- gnu/packages/sphinx.scm | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5f159c39d1..a0ad12a29f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5502,13 +5502,13 @@ (define-public python-makefun (define-public python-markdown-it-py (package (name "python-markdown-it-py") - (version "2.1.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (pypi-uri "markdown-it-py" version)) (sha256 (base32 - "1nh75i72584r70alhqc479gys04s5m5g3vq601yf2njbs7z5jzng")))) + "1swgvyiavak0nmfb31lq5zck5chwhmyf6qb6qwpcav86zaa0mxp3")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;pypi source does not contains tests (native-inputs (list python-flit)) @@ -5524,6 +5524,17 @@ (define-public python-markdown-it-py possible.") (license license:expat))) +(define-public python-markdown-it-py-2.1 + (package + (inherit python-markdown-it-py) + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "markdown-it-py" version)) + (sha256 + (base32 + "1nh75i72584r70alhqc479gys04s5m5g3vq601yf2njbs7z5jzng")))))) + (define-public python-markupsafe (package (name "python-markupsafe") diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 7e5a929241..89196086f2 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -792,7 +792,7 @@ (define-public python-myst-parser (list python-docutils python-jinja2 python-linkify-it-py - python-markdown-it-py + python-markdown-it-py-2.1 python-linkify-it-py python-mdit-py-plugins python-pyyaml From patchwork Sun Jan 14 23:56:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 58874 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 2E5FD27BBE9; Sun, 14 Jan 2024 23:57: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_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 99EF727BBE2 for ; Sun, 14 Jan 2024 23:57:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPALl-0006eE-5D; Sun, 14 Jan 2024 18:57:09 -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 1rPALh-0006co-RR for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:05 -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 1rPALh-0008SC-Ja for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPALh-0002Mq-0q for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68459] [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: Sun, 14 Jan 2024 23:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68459@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17052765958997 (code B ref -1); Sun, 14 Jan 2024 23:57:04 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 23:56:35 +0000 Received: from localhost ([127.0.0.1]:44263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPALD-0002L1-7r for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:35 -0500 Received: from lists.gnu.org ([2001:470:142::17]:53572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAL8-0002Js-Kj for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:31 -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 1rPAL0-0006ZY-VU for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:24 -0500 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPAKy-0008IQ-1r for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1705276577; bh=MkmIGEnWJwCXialgLiCBbVZh1O0oZSzkUfrJnmmSDT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xmi3+kiP+rcl0VIldgmf0wxruQwmZi5CK+uLZq9qnXVrxjan7FDJX8qVxxqhcihmi qn09dadVdxjXq9oDR2U7eR8MgEY+wGVag8YZoq4VZbJB65gKTTeveGA8XLggzjBL06 2ba6peKQi3IAFhAwYi/X6yKlaSLHKDlaa7j/U47Q= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TCscK5CJgz1117; Sun, 14 Jan 2024 23:56:17 +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 4TCscK4HxDz10yK; Sun, 14 Jan 2024 23:56:17 +0000 (UTC) Date: Mon, 15 Jan 2024 00:56:06 +0100 Message-ID: <20240114235609.24296-3-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240114235609.24296-1-goodoldpaul@autistici.org> References: <20240114235609.24296-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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") From patchwork Sun Jan 14 23:56:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 58873 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 8B65227BBEA; Sun, 14 Jan 2024 23:57:42 +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 E030E27BBE2 for ; Sun, 14 Jan 2024 23:57:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPALi-0006dL-IJ; Sun, 14 Jan 2024 18:57:06 -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 1rPALg-0006cD-C2 for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:04 -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 1rPALg-0008Rz-3W for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPALf-0002MN-HP for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68457] [PATCH v4 4/6] gnu: python-jupytext: Update to 1.15.2. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jan 2024 23:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68457 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68457@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17052765928974 (code B ref -1); Sun, 14 Jan 2024 23:57:03 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 23:56:32 +0000 Received: from localhost ([127.0.0.1]:44259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPALA-0002Kg-7d for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:32 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAL7-0002Jm-7q for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:29 -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 1rPAL0-0006ZR-8v for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:22 -0500 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPAKy-0008IT-1z for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1705276577; bh=el43snspAHZQrcS5ALEWTgG0W4YP8mR6G0wNE2x7agk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hneUtSr+1DZ/v+5w1ndo4cKaj4RD53RNhAV2nD0RGaMIdesixNsMxTSt37b4oEAgG MC3GMi9PhWgICP0YfhGuoRPGMirLVgJtEeBTcFSr9LwbpkWswZ3rNOyJCHV93xZDav K/alqO3/rbb+FA3m5n0ny42f/lOE0tGe+42wVx38= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TCscK6kLsz111C; Sun, 14 Jan 2024 23:56:17 +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 4TCscK5kpQz10yK; Sun, 14 Jan 2024 23:56:17 +0000 (UTC) Date: Mon, 15 Jan 2024 00:56:07 +0100 Message-ID: <20240114235609.24296-4-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240114235609.24296-1-goodoldpaul@autistici.org> References: <20240114235609.24296-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/python-xyz.scm (python-jupytext): Update to 1.15.2; [build-system]: switch to pyproject-build-system; [arguments]: add setup-test-environment phase, use check phase from build system and move test flags from here... : ... to here. Change-Id: Iaec4090823715230e26865d4639871fb7c565802 --- gnu/packages/python-xyz.scm | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cef458e0fc..b4b95637c7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -336,7 +336,7 @@ (define-public python-janus (define-public python-jupytext (package (name "python-jupytext") - (version "1.14.4") + (version "1.15.2") (source (origin (method git-fetch) @@ -345,27 +345,23 @@ (define-public python-jupytext (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19d443vx597zzxna09qpync9iic3mris80bwm3kd8xaxaq0zq9w4")))) - (build-system python-build-system) + (base32 "0zi2b2g9b2dkzl69li5rwc17pdcxj8cxzlysd8s6jqbcc37jiwqs")))) + (build-system pyproject-build-system) (arguments (list + #:test-flags + #~'("-k" #$(string-join (list "not test_create_header_with_set_formats" + "test_pre_commit_hook" + "test_sync_with_pre_commit_hook") + " and not ")) #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (add-before 'check 'setup-test-environment + (lambda _ ;; some tests fail when HOME=/homeless-shelter. (setenv "HOME" "/tmp") ;; OSError: [Errno 18] Invalid cross-device link - (setenv "TMPDIR" "/tmp") - (when tests? - (let ((disabled-tests - (list "test_create_header_with_set_formats" - "test_pre_commit_hook" - "test_sync_with_pre_commit_hook"))) - (invoke "pytest" "-vv" "-k" - (string-append "not " - (string-join disabled-tests - " and not ")))))))))) + (setenv "TMPDIR" "/tmp")))))) (native-inputs (list git-minimal pre-commit From patchwork Sun Jan 14 23:56:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 58869 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 4E91927BBEC; Sun, 14 Jan 2024 23:57:30 +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 857E027BBE9 for ; Sun, 14 Jan 2024 23:57:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPALi-0006dX-LQ; Sun, 14 Jan 2024 18:57:06 -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 1rPALh-0006cb-3e for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:05 -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 1rPALg-0008S6-RO for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPALg-0002Mb-8W for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68458] [PATCH v4 5/6] gnu: python-mdit-py-plugins: Update to 0.4.0. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jan 2024 23:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68458 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68458@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17052765958989 (code B ref -1); Sun, 14 Jan 2024 23:57:04 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 23:56:35 +0000 Received: from localhost ([127.0.0.1]:44261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPALC-0002Ku-Oi for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:35 -0500 Received: from lists.gnu.org ([2001:470:142::17]:53576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAL8-0002Jt-Mr for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:31 -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 1rPAL1-0006Za-Ct for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:24 -0500 Received: from confino.investici.org ([2a11:7980:1::2:0]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPAKy-0008IV-O1 for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1705276578; bh=f8IijPPAB8jvwqJRC8IbyJ9til3znBT7dyTMAqF954o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TRsdpvxymC36e4WK8ZEVGRW0tzNPMW+ezHZ9uJI2w0Ze0GJAOXP1kylajFn42my0l dXFskpjMwCi6bPc5hoBw6UntTQf2yev6oP5tny3xNfyVe++x1fDAYg7KJkFNLVWDAF sdHnFXRMdveQH8648LxnN2Gy4y092qWYjbHbzGAg= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TCscL1LFcz111J; Sun, 14 Jan 2024 23:56:18 +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 4TCscK75Z0z10yK; Sun, 14 Jan 2024 23:56:17 +0000 (UTC) Date: Mon, 15 Jan 2024 00:56:08 +0100 Message-ID: <20240114235609.24296-5-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240114235609.24296-1-goodoldpaul@autistici.org> References: <20240114235609.24296-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a11:7980:1::2:0; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/python-xyz.scm (python-mdit-py-plugins): Update to 0.4.0; (python-mdit-py-plugins-0.3): new variable. * gnu/packages/python-xyz.scm (python-myst-parser)[propagated-inputs]: Use python-mdit-py-plugins-0.3. Change-Id: I06ddbee6055b570ee2d40f3e4f0a478a4413b4fe --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++-- gnu/packages/sphinx.scm | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b4b95637c7..e2013a3995 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -906,7 +906,7 @@ (define-public python-lunr (define-public python-mdit-py-plugins (package (name "python-mdit-py-plugins") - (version "0.3.1") + (version "0.4.0") (source (origin (method git-fetch) ;for tests (uri (git-reference @@ -915,7 +915,7 @@ (define-public python-mdit-py-plugins (file-name (git-file-name name version)) (sha256 (base32 - "00ybbfb6dzn9q5qnvnm8bmhd84s215ik7pcdb4r35zhwiv2ikizz")))) + "1790fcf3nd9c5j37fx87x3ivfyihk6l74jxj1qxvw3qfyb96w4k0")))) (build-system pyproject-build-system) (propagated-inputs (list python-markdown-it-py @@ -943,6 +943,23 @@ (define-public python-mdit-py-plugins @end enumerate") (license license:expat))) +(define-public python-mdit-py-plugins-0.3 + (package + (inherit python-mdit-py-plugins) + (version "0.3.1") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/executablebooks/mdit-py-plugins") + (commit (string-append "v" version)))) + (file-name (git-file-name "python-mdit-py-plugins" version)) + (sha256 + (base32 + "00ybbfb6dzn9q5qnvnm8bmhd84s215ik7pcdb4r35zhwiv2ikizz")))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-mdit-py-plugins) + (replace "python-markdown-it-py" python-markdown-it-py-2.1))))) + (define-public python-mdurl (package (name "python-mdurl") diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 89196086f2..40a65e45b5 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -794,7 +794,7 @@ (define-public python-myst-parser python-linkify-it-py python-markdown-it-py-2.1 python-linkify-it-py - python-mdit-py-plugins + python-mdit-py-plugins-0.3 python-pyyaml python-sphinx python-typing-extensions)) From patchwork Sun Jan 14 23:56:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giacomo Leidi X-Patchwork-Id: 58872 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 02DB627BBE2; Sun, 14 Jan 2024 23:57:39 +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 E73B727BBEA for ; Sun, 14 Jan 2024 23:57:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPALl-0006eR-C7; Sun, 14 Jan 2024 18:57:09 -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 1rPALj-0006df-8a for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:07 -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 1rPALj-0008SR-0R for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPALi-0002NL-CE for guix-patches@gnu.org; Sun, 14 Jan 2024 18:57:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68461] [PATCH v4 6/6] gnu: python-textual: Update to 0.47.1. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jan 2024 23:57:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68461 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68461@debbugs.gnu.org Cc: Giacomo Leidi X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17052765969013 (code B ref -1); Sun, 14 Jan 2024 23:57:06 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jan 2024 23:56:36 +0000 Received: from localhost ([127.0.0.1]:44267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPALE-0002LB-5F for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:36 -0500 Received: from lists.gnu.org ([2001:470:142::17]:53598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPAL9-0002Jx-Qj for submit@debbugs.gnu.org; Sun, 14 Jan 2024 18:56:32 -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 1rPAL2-0006Zv-TD for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:26 -0500 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPAL1-0008Ir-1t for guix-patches@gnu.org; Sun, 14 Jan 2024 18:56:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1705276578; bh=n3Br33viW4G8SZx8a++XuUYnJuooS6ySlzNhiPi1IQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PssYVZ+AhbGnuVFWVihqv+SvnyxRKYnavbf2PapvR0n0mqVCCULqfwld3XM6P9djU ne1MJK8d0IRNl+H3E1v4qGwcdfn5bGaCMPY4jQJZAUyWiokN4/2LybTeKx7/UOz2MC OOR4TVBXsn409qyA4QGQetabsrbVDuAy+3RfsfsU= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TCscL2hV0z111b; Sun, 14 Jan 2024 23:56:18 +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 4TCscL1mbrz10yK; Sun, 14 Jan 2024 23:56:18 +0000 (UTC) Date: Mon, 15 Jan 2024 00:56:09 +0100 Message-ID: <20240114235609.24296-6-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240114235609.24296-1-goodoldpaul@autistici.org> References: <20240114235609.24296-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Received-SPF: pass client-ip=93.190.126.19; envelope-from=goodoldpaul@autistici.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/python-xyz.scm (python-textual): Update to 0.47.1; [source]: switch to git-origin; [build-system]: switch to pyproject-build-system; [arguments]: disable failing tests; : use check phase from pyproject-build-system and adapt build machinery to our old version of poetry; [propagated-inputs]: adapt to pyproject.toml; [native-inputs] add poetry and python-pytest-asyncio. Change-Id: I1060b25cb2ec439f26a4348305bc05fd0b09cf07 --- gnu/packages/python-xyz.scm | 58 ++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e2013a3995..997b40172e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18665,20 +18665,8 @@ (define-public python-rich-click (define-public python-textual (package (name "python-textual") - (version "0.1.18") + (version "0.47.1") (source (origin - (method url-fetch) - (uri (pypi-uri "textual" version)) - (sha256 - (base32 - "08yg5a51hz1axfj5hx28hx31gq5apcj6vpkkmawmiplisa73z25j")))) - (build-system python-build-system) - (arguments - (let ((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/Textualize/textual") @@ -18686,19 +18674,41 @@ (define-public python-textual (file-name (git-file-name name version)) (sha256 (base32 - "0b3ycwqhp21mg9fvmadgxhgbvkwq6fd784l2xcmvy77rravrnnax"))))) - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (copy-recursively #$(file-append tests "/tests") - "tests") - (invoke "python" "-m" "pytest" "-vv")))))))) + "1984v02n2wa7rqgq0f0mkma8fd0nnnbgfwcwgmpsd8xl1wlrjmj4")))) + (build-system pyproject-build-system) + (arguments + (list + ;; 3 failed, 1932 passed, 1 skipped, 4 xfailed, 10 warnings in 115.19s (0:01:55) + #:test-flags + #~'("-k" + ;; this test fails because of an AssertionError: + ;; assert app.devtools is not None + #$(string-append "not test_textual_env_var" + ;; these tests require python-tresitter-languages + " and not test_register_language" + " and not test_register_language_existing_language")) + #:phases #~(modify-phases %standard-phases + ;; TODO: This is because of our old version of poetry. + ;; It can be removed once it's been updated to a current one. + (add-after 'unpack 'adapt-pyproject.toml + (lambda _ + (substitute* "pyproject.toml" + (("group\\.dev\\.") "dev-")))) + ;; snapshot tests require syrupy + (add-after 'adapt-pyproject.toml 'remove-snapshot-tests + (lambda _ + (delete-file "tests/snapshot_tests/test_snapshots.py")))))) (propagated-inputs - (list python-rich python-typing-extensions)) + (list python-importlib-metadata + python-linkify-it-py + python-markdown-it-py + python-mdit-py-plugins + python-rich + python-typing-extensions)) (native-inputs - (list python-pytest)) + (list poetry + python-pytest + python-pytest-asyncio)) (home-page "https://github.com/Textualize/textual") (synopsis "Build text user interfaces in Python") (description "Textual is a @acronym{TUI, Text User Interface} framework