guix-commits
[Top][All Lists]
Advanced

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

01/07: gnu: stcgal: Patch tests for PyYAML 6.


From: guix-commits
Subject: 01/07: gnu: stcgal: Patch tests for PyYAML 6.
Date: Wed, 14 Sep 2022 15:09:15 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 0b8d2f407c6883acc60a6fbb7a75450ea32a73fc
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Sep 14 15:25:28 2022 +0200

    gnu: stcgal: Patch tests for PyYAML 6.
    
    This fixes a regression since commit
    27720d0fe14ee4cd413a6745e0782a698a011924.
    
    * gnu/packages/embedded.scm (stcgal)[source](modules, snippet): New fields.
---
 gnu/packages/embedded.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 951bbc8db4..0458ed5f13 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019, 2021 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2020, 2021, 2022 Simon South <simon@simonsouth.net>
@@ -1330,7 +1330,14 @@ these identified regions.
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1d10qxyghz66zp7iqpm8q8rfv9jz9n609gxmfcav1lssmf1dlyk3"))))
+                "1d10qxyghz66zp7iqpm8q8rfv9jz9n609gxmfcav1lssmf1dlyk3"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Make tests compatible with PyYAML 6 and later.
+               '(substitute* '("tests/test_program.py"
+                               "tests/test_fuzzing.py")
+                  (("yaml\\.load\\(test_file\\.read\\(\\)\\)")
+                   "yaml.load(test_file.read(), Loader=yaml.SafeLoader)")))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-pyserial python-pyusb python-tqdm))



reply via email to

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