From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wNwdCUkMGmQgVAAASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 20:58:01 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2JYoCUkMGmR5UAAAauVa8A (envelope-from ) for ; Tue, 21 Mar 2023 20:58:01 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D5BC9FF4C for ; Tue, 21 Mar 2023 20:58:00 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=FDw7xaLX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679428681; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=aeUtSmSivZ+uMP3+UAEe9tGZN2IvRe3ixa8W1beKkcA=; b=YWsksnefGvjzWc8mK3wExgj5jR+TbYlQTLcfwT8omMSW4peLFtyZJ6l0edLVkUta42ot5Y D7ecKJiuHh55gXqzFe2+1j2y2RgvPAi5fgJVdJDHoSUWeGuAlyKa6/zI2U4njoQ8EjaXxC msjsCZ4a2YEX5SiDUAEW5o1lFBzNVRc8fCRNP18LjU/hyuMxSR+e3eZhxSa6NzNaMnbasU vasdvoy+hfFcCbnLPSeN5ERjbqaY9j91T2TMlSOSVEgCgyPYm4rSNplVPl8qQL2D7K83rZ pjgXuOjXfc0BrSZQvCh+wnselOntTak0DxxevFsp9PJ6PYMJh5/rPocR9T9pog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=FDw7xaLX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679428681; a=rsa-sha256; cv=none; b=uQ5mRotAgp2Sm5psSP3HVMdQLlbkH6wOChJ1LtZBLi8Wu8uxY86Q235/CUW0dHrWfaJNgz 5aWacAv1vm0KNmsVsiBsCuaC+V5LBZaf5DLjzxA+sCIAOPWkl3U8DwRdbmhCmm3ZNQAxEi wAI0TqzVyVvN+aTfdFr7TAeWj/wY3rbkzIWUek8xcmPhOrALQqlyBryhZtELBaPdT0EoKp 2j20GoxDa8p46Mwp6D7bTILT+flD2vvJSNR1j6LP90FQz1qb6aFJeCdS9MnZrIrveC/yfu VGYZqpW6NtoiAER0sU6hQIED161HYSvWYsbvhxkCdu2n7oihnV96thUVfFlXRw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pei6V-00031Z-LX; Tue, 21 Mar 2023 15:57:07 -0400 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 1pei6S-0002zt-4L for guix-patches@gnu.org; Tue, 21 Mar 2023 15:57:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pei6R-0000Fs-4G for guix-patches@gnu.org; Tue, 21 Mar 2023 15:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pei6R-0003su-0M for guix-patches@gnu.org; Tue, 21 Mar 2023 15:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62252] [PATCH v2 02/19] gnu: python-imageio: Update to 2.26.0. References: <291d52e688bb1d56ecd6561282fd9713bf237ed9.camel@gmail.com> In-Reply-To: <291d52e688bb1d56ecd6561282fd9713bf237ed9.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 19:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62252 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62252@debbugs.gnu.org Received: via spool by 62252-submit@debbugs.gnu.org id=B62252.167942860514774 (code B ref 62252); Tue, 21 Mar 2023 19:57:02 +0000 Received: (at 62252) by debbugs.gnu.org; 21 Mar 2023 19:56:45 +0000 Received: from localhost ([127.0.0.1]:60815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pei68-0003q8-EA for submit@debbugs.gnu.org; Tue, 21 Mar 2023 15:56:44 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:36590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pei61-0003oJ-2L for 62252@debbugs.gnu.org; Tue, 21 Mar 2023 15:56:38 -0400 Received: by mail-ed1-f66.google.com with SMTP id w9so64316442edc.3 for <62252@debbugs.gnu.org>; Tue, 21 Mar 2023 12:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679428591; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=aeUtSmSivZ+uMP3+UAEe9tGZN2IvRe3ixa8W1beKkcA=; b=FDw7xaLXbjBtMWDqdn66SS2Pu8A2UJHOQJBdnrVEfdqemKyvYEYHGo3pdtxzNCpwHg BUxYsX2ybse26Z0HE4/VYMb7ptSwjQ/URnO9NLbj+pObtaxxcSzGlbViZM4+lv1Xhtbo kZpuWiQyGdfJ89bkWEFFN4MZWdTwF0J7hFVjGQ0uJBCE5SowqI3ETeX3zykygTz/VvI/ a0Z1SGtroCoGaqf37PB0VdIA9RxbdYFmASuKLsepwUKeN7PffnhfYX1vdayCa1OPytrf 3WzI5sz/+5qhzzMWfApKf7xnx29XRgcsdO1GRGeEYU7bp7HzeALY2cpimjeLp3CcqbF2 eF6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679428591; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aeUtSmSivZ+uMP3+UAEe9tGZN2IvRe3ixa8W1beKkcA=; b=crSyS0O3xWJZliPI4cVZ2ov7aLzQep0twQIlFkA7WkFel/P+Av/4jNGIaeKSGEzMzB Ph4TObVo1CI/2Iz7kgf3BhzfNsW3REySHdPsD7nhdMQNo92HOs9K2S7bqaJBwsXNvrET SAMIMvefwedxrfAnakjeThj0+DWSuVXTChF1iZzRQvmXXJs3Z05V6hwnMMcJqThkO+L2 GPFfk9TtjBmGDcRrSY6YFGbYSz7M6YdRiI3nhWHnE53fekEO1wzUjRFKvt8AcJNbphpu hqAR0n4AqN5phtasznwXKwgvMW4gpVOqFH6BsH9mlRzYbjH5+sTsJHrH2rdjTGdvd21b aq+g== X-Gm-Message-State: AO0yUKVb/MJKYK3krEZdZx28gCV/5H1QDFnt/vmgC6qwfg+Sa3x0Wzze 2A7VM7yaOtQPl27x3DLiOcCTa7yqdsCJlw== X-Google-Smtp-Source: AK7set/5F2Pq+OsX76ZPpvUoakr56EHZPSPT2kXUvBxJDA+4pVOCSZeI4fqnI6ZqsiffQFHUaGGX0A== X-Received: by 2002:a17:906:6a94:b0:92b:f019:d5eb with SMTP id p20-20020a1709066a9400b0092bf019d5ebmr4332932ejr.44.1679428591210; Tue, 21 Mar 2023 12:56:31 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id le1-20020a170907170100b00930d505a567sm6165675ejc.128.2023.03.21.12.56.30 for <62252@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 12:56:30 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 18 Mar 2023 07:51:37 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: 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: X-Migadu-Queue-Id: D5BC9FF4C X-Spam-Score: -2.25 X-Migadu-Spam-Score: -2.25 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: 3YM4qMq6jllt * 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 | 44 +++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 41be99373b..c41f85af4a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8052,29 +8052,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)))))) - (propagated-inputs - (list python-numpy python-pillow python-psutil)) + (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-imageio-ffmpeg python-numpy python-pillow python-psutil)) (native-inputs (list python-pytest)) (home-page "https://imageio.github.io/") -- 2.39.2