From 1b02bdeb1a0262d4a49736507ee2e2a75390a332 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jan 2025 18:31:16 +0100 Subject: gnu: python-pyvisa: Update to 1.14.1. * gnu/packages/engineering.scm (python-pyvisa): Update to 1.14.1. [source]: Simplify snippet. [arguments]: Fix tests by adding --pyargs. [native-inputs]: Add python-setuptools-scm. [propagated-inputs]: Remove python-dataclasses. Change-Id: I59fc4333e975e9e5ae4a906df20dbf7bce5d6a0a --- gnu/packages/engineering.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f9c4ac9bbd..fc92f5f070 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015-2023 Ricardo Wurmus +;;; Copyright © 2015-2025 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016, 2018, 2020-2024 Efraim Flashner ;;; Copyright © 2016 David Thompson @@ -2661,32 +2661,35 @@ (define-public lib3mf (define-public python-pyvisa (package (name "python-pyvisa") - (version "1.13.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (pypi-uri "PyVISA" version)) (sha256 (base32 - "1iprr3h6d4w6v8ksgqpkgg545sai7i8hi5a5an394p26b25h1yl9")) + "0ybsxpc4339434ha5anix511ckdyp12cym3ld1vsspacxm0h00vi")) (modules '((guix build utils))) - (snippet '(begin - ;; Delete bundled python-prettytable. - (delete-file-recursively "pyvisa/thirdparty"))))) + ;; Delete bundled python-prettytable. + (snippet '(delete-file-recursively "pyvisa/thirdparty")))) (build-system pyproject-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'use-system-prettytable - (lambda _ - (substitute* "pyvisa/shell.py" - (("from .thirdparty import prettytable") - "import prettytable"))))))) + (list + #:test-flags + '(list "--pyargs" "pyvisa") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-system-prettytable + (lambda _ + (substitute* "pyvisa/shell.py" + (("from .thirdparty import prettytable") + "import prettytable"))))))) (native-inputs (list python-pytest python-setuptools + python-setuptools-scm python-wheel)) (propagated-inputs - (list python-dataclasses - python-prettytable + (list python-prettytable python-typing-extensions)) (home-page "https://pyvisa.readthedocs.io/en/latest/") (synopsis "Python binding for the VISA library") -- cgit v1.2.3