From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IIq5Hp7oH2Ru8wAASxT56A (envelope-from ) for ; Sun, 26 Mar 2023 08:39:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cJndHZ7oH2T+VgEAG6o9tA (envelope-from ) for ; Sun, 26 Mar 2023 08:39:26 +0200 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 364972B4ED for ; Sun, 26 Mar 2023 08:39:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgK0y-0008SO-PI; Sun, 26 Mar 2023 02:38:04 -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 1pgK0x-0008Rm-Kx for guix-patches@gnu.org; Sun, 26 Mar 2023 02:38:03 -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 1pgK0x-0004Yf-A9 for guix-patches@gnu.org; Sun, 26 Mar 2023 02:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgK0x-0003a4-1u for guix-patches@gnu.org; Sun, 26 Mar 2023 02:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62252] [PATCH v3 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: Sun, 26 Mar 2023 06:38:03 +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.167981263413486 (code B ref 62252); Sun, 26 Mar 2023 06:38:03 +0000 Received: (at 62252) by debbugs.gnu.org; 26 Mar 2023 06:37:14 +0000 Received: from localhost ([127.0.0.1]:43911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgK09-0003VH-F3 for submit@debbugs.gnu.org; Sun, 26 Mar 2023 02:37:14 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgK06-0003US-Cu for 62252@debbugs.gnu.org; Sun, 26 Mar 2023 02:37:11 -0400 Received: by mail-wr1-f68.google.com with SMTP id d17so5531258wrb.11 for <62252@debbugs.gnu.org>; Sat, 25 Mar 2023 23:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679812625; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=TsvUan95ep3eSUpiRvJYXehI3y8BVbmILr+468sccAQ=; b=XT6I8dgczUB3zSI/WPtemDsE2GL+1Dz3wFGwKhoO6KLy7Ni2D7bFHxdFHsYiIS2QIL sJBeEMYe9OxxKMy4sBjOtrhO3ySLP0GEGP0mq6fbMEAmvKstHciZ84yoH2JsurYVkZrD 0knkpRAFSIqScB/9q/XM5spDoycaUmpVSaVsBbCUfyHhkHPSniNqHx2gWApKbzXpE/Ci 8adYqhUVO9IeUB+xmGx3SZ1bJucT5mC+GaLCwWg3bz8Mp0AGWrUPEMa0DoR+G+tGRDd0 iQja8fSrWQDMnvruEjSC0hv00Tr5c7OgPl+WONBAlT9WAmxaHx0nrzCYrzW7UZ3odqbx Wi+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679812625; 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=TsvUan95ep3eSUpiRvJYXehI3y8BVbmILr+468sccAQ=; b=wvVVu8Sax0iVXmb+s6m9vpaKA4YZ7PmjNJ1zCNuXQ8Np9dj1RiJDfgnaxOvuK7GMl7 eMRSKn1CbEpwcYqnbT/WNhhEkETN9dYa4AoXU6X0tU2/eLoPm57+dz6Zzw+fCcEMBDAe ZIVsqKZZNJ5+zoJ5ljQ/ORzdcFzgzWpPP5UsJBt59arFHwuWhWZYoAzVx5ieX0nABHcp iNrlOfiCrOX23C2unl8EPBAlj42p5k1VM62tVScYDvZlkrCpJNunO3xnFvJjqC9l+dhs xq/s+Hhcitd7lqy8vgiVIdgFAOYkYgO3TGXnCvtbmfrtRGXVAoYeWmSKA7WFOtDfqf/8 S4rQ== X-Gm-Message-State: AAQBX9ecGY8AGDEycmp4gD6EKX2MWPgYUWTrOQwseFUwHeZ3J6PLSapA QlsinHe5i43+Le9y4q6rWODGvr7Ij6ZNBg== X-Google-Smtp-Source: AKy350Z0X7+rrZ0/vdaRtblI4J8h7ykAxCU3H7CTsrRaSd4Tsv+KhH9sRX7z0evepqtV9VFhlLy0EQ== X-Received: by 2002:adf:dd06:0:b0:2d4:62ed:e7cf with SMTP id a6-20020adfdd06000000b002d462ede7cfmr6530383wrm.43.1679812624865; Sat, 25 Mar 2023 23:37:04 -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 z6-20020a056000110600b002c557f82e27sm21953707wrw.99.2023.03.25.23.37.04 for <62252@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 23:37:04 -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: <1bf2327f20a14eca2bbaa529a9297edd0f62de30.camel@gmail.com> 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: 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679812766; a=rsa-sha256; cv=none; b=sOFcUQFEg0msAlFhlTUYsrkL7d//tqyBOsgNNJ9muLJ4O9nobbh+9gdRnWN8HolB95qqAZ 56VIMylXOhKImS3QZ+FAS9DAVMaW9B1JMzO588myWbtdI8YCMHbEctZHcWZ1O6QQjEXrG1 Ivw3AKCwlmJgixj+IwVQKMz5Lsu/szwd9DMIPS73/PfcXkvLsB70OPrnNb5kL9XdkDFFjT yGMMmudPKK+Edqx0GfBSJgSspTmQREDXsJSRHp1muGAlqt25HAKb28gT7NxIH13b7KUZGN Ruel/jcfrk9IJPg9j6SIUBoNgbNcp2gjbLH2MAOu+4QctNddMnmPqOqBymfRmA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=XT6I8dgc; 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=1679812766; 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=TsvUan95ep3eSUpiRvJYXehI3y8BVbmILr+468sccAQ=; b=CyyYr9n945GOzHrdCfUNSIxR0XA/Cda0t8KqBpt7T5gNAkVCHfCCbwrx/x1atYG1O83CmM 7fxSuxFYttRl3Hp+j0s47T6RTc/Z8MWOWFEQUcrJIzN8gEDO8rGe57w7M7qnkNb5FBm4Gn z23a0J3xAMg1i/Txzt/dg9tqURk5q4CQcscfccu0bDTTHFilqlCm1qboHObIATn0NA8Z66 2P//0K1Prvh8vkm3gfj6Z8LfXtFDgoxLK8MsypUVZiDrkMTZs3hTIcENmhf4ECdOm6JrEs x643y2Glzf8pn3keBIuZWodZhgxFtig7TNX9KwSebT1hlS+Oh+PQcmMWIjRNMA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=XT6I8dgc; 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" X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 0.37 X-Spam-Score: 0.37 X-Migadu-Queue-Id: 364972B4ED X-TUID: A+K1aM33wiEH * 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 5b515489b4..f4f17b7e87 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8119,29 +8119,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