From 8fdf5535c4b2d955ea38c7f9724d5c85ee56e617 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 18 Mar 2023 07:51:37 +0100 Subject: [PATCH] gnu: python-imageio: Update to 2.26.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-imageio): Update to 2.26.0. [build-system]: Use pyproject-build-system. [arguments]: Use G-Expressions. <#:tests?>: Drop argument. <#:test-flags>: New argument. <#:phases>: Drop replacement for ‘check’. Add ‘fix-source’ and ‘fix-failing-tests’. [inputs]: Add freeimage. [propagated-inputs]: Add python-imageio-ffmpeg. --- gnu/packages/python-xyz.scm | 42 ++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a845340f6..69dadd83ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8197,29 +8197,41 @@ (define-public python-imageio-ffmpeg (define-public python-imageio (package (name "python-imageio") - (version "2.8.0") + (version "2.26.0") (source (origin (method url-fetch) (uri (pypi-uri "imageio" version)) (sha256 (base32 - "1ksjl523fm0fikrd85llxfba35rc1qsgwadgr6mbn9kis79xcpzv")))) - (build-system python-build-system) + "0dgddhi5dlpry5j4d3256v09pcziyj3ii47yx0zi68xprm11d7qn")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ; many tests require online data - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key outputs inputs tests? #:allow-other-keys) - (if tests? - (begin - ;; Make installed package available for running the tests. - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv")) - #t)))))) + (list + #:test-flags #~(list "-m" "not needs_internet") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "imageio/plugins/_freeimage.py" + (("os\\.getenv\\(\"IMAGEIO_FREEIMAGE_LIB\".*\\)" all) + (string-append + "(" all " or \"" + (search-input-file inputs "lib/libfreeimage.so") + "\")"))) + (substitute* "imageio/core/util.py" + (("\"/var/tmp\"") + "os.getenv(\"TMPDIR\", \"/tmp\")")))) + (add-after 'unpack 'fix-failing-tests + (lambda _ + (substitute* "tests/test_core.py" + (("(core\\.load_lib)\\((\\[gllib\\], \\[\\])\\)" + all fun args) + (string-append "raises(ValueError, " fun ", " args ")"))) + (delete-file "tests/test_freeimage.py")))))) + (inputs (list freeimage)) (propagated-inputs - (list python-numpy python-pillow python-psutil)) + (list python-imageio-ffmpeg python-numpy python-pillow python-psutil)) (native-inputs (list python-pytest)) (home-page "https://imageio.github.io/")