guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/17: gnu: python-m2r: Adjust for Python 3.10.


From: guix-commits
Subject: 05/17: gnu: python-m2r: Adjust for Python 3.10.
Date: Sat, 13 Aug 2022 13:26:49 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 06db41651c521dd9feb58953e98d690ae17298bf
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Aug 12 23:39:13 2022 +0200

    gnu: python-m2r: Adjust for Python 3.10.
    
    * gnu/packages/python-xyz.scm (python-m2r)[source](modules, snippet): New
    fields.
---
 gnu/packages/python-xyz.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 42e2b00d48..22f1c4043a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19093,7 +19093,15 @@ from the header, as well as section details and data 
available.")
               (uri (pypi-uri "m2r" version))
               (sha256
                (base32
-                "16gdm8i06jjmlpvckpfmlkr4693dh0vs192vgsqn84fsdkbbm45z"))))
+                "16gdm8i06jjmlpvckpfmlkr4693dh0vs192vgsqn84fsdkbbm45z"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Adjust test regex for Python 3.10 compatibility.
+               ;; Taken from upstream pull request:
+               ;; https://github.com/miyakogi/m2r/pull/62
+               '(substitute* "tests/test_cli.py"
+                  (("self.assertIn\\('optional arguments:', message\\)")
+                   "self.assertRegex(message, r'option(s|al arguments):')")))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-docutils python-mistune))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]