From patchwork Sat Mar 18 06:51:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 11104 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4053016EE1; Sat, 18 Mar 2023 10:07:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C7C1C16E9E for ; Sat, 18 Mar 2023 10:07:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdTRt-0007rP-H9; Sat, 18 Mar 2023 06:06:05 -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 1pdTRr-0007pE-KP for guix-patches@gnu.org; Sat, 18 Mar 2023 06:06: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 1pdTRr-00064w-AO for guix-patches@gnu.org; Sat, 18 Mar 2023 06:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pdTRr-0001Uw-05 for guix-patches@gnu.org; Sat, 18 Mar 2023 06:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62252] [PATCH 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: Sat, 18 Mar 2023 10:06: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.16791339305568 (code B ref 62252); Sat, 18 Mar 2023 10:06:02 +0000 Received: (at 62252) by debbugs.gnu.org; 18 Mar 2023 10:05:30 +0000 Received: from localhost ([127.0.0.1]:46257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdTRK-0001Rc-33 for submit@debbugs.gnu.org; Sat, 18 Mar 2023 06:05:30 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:41811) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdTRC-0001Pn-SB for 62252@debbugs.gnu.org; Sat, 18 Mar 2023 06:05:23 -0400 Received: by mail-ed1-f67.google.com with SMTP id h8so29212304ede.8 for <62252@debbugs.gnu.org>; Sat, 18 Mar 2023 03:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679133917; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=O6D9782cZxoxVanm8izJFXnigdt1spWYuBBdVSvXOx0=; b=Ea+0X/R5HL+AQV6Ui9p5TuuLd29Ax0kiY+6ftGxX3o/hddw6wfXvN9vo27CmdQ8Wmm qtNRl2fGDXN7fRjulpP4BXu1eYxTQAFCrha976+XyoWWNxD/GtZ9YH7mWC+Grb6k6gpq SPa5wdsH2eglv2i8k4ERuuDQ4mHeMYhrDv9gUFuFVhnnahG/gbwK/51EgFsyyBpvOvIa zx7mIhgR1NiPj81ai19YzziD+gyrGpgYlWdhLJPB5gKTTxnG3cA9RpH1DGJADtSB7ITr HxlzjBPRHawf1JteCblps/0Wv8/AgmHmpmg78w0KB4kDaCCxprrHlm+BgpJcnAJ4GHLf 6v1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679133917; 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=O6D9782cZxoxVanm8izJFXnigdt1spWYuBBdVSvXOx0=; b=qtk5qdVxfrR4rCLM9JF930z86K4h6QJIIHWBCdbYWsMRR+B3mHiManwA+RmCk+VASY c/CQilJ4UGdpYHZoNQbmhi8r8rjrULKUDVNfBt2D9eK4qbb1kAwXR6/zJNuq8alpHIsP /9qgDoQxTcLiNNZhNIUvEF5u3ga9K0cgpgX7ph/kZc9XL4oGNpNxEWW1HXCcRHn/nh1u bsd72LS3TVRrCo2pSO+eSrqyV5Vp3ipadu3alEu6gxGaVzZM/JAjIW4k6JAQQ7UhzG5h SlbTsjnfgaO+Kx9wfJA54P255ALlvZsTnUXdgA5w2tvMuMGDmjt/+7mxwWF8Yg17Pzzq CjcA== X-Gm-Message-State: AO0yUKUu6qrKZ0c4+kqbUxDokXKaa1Neki8S/30C8cbn6UT+A83KqCYR 7t/SRbo/6WuQfawFBwMle9M0bIQboSPdMg== X-Google-Smtp-Source: AK7set8QRtFWdHg9FxlQfcqDUr+AKd68r4TNrECwm908BNnd+6zuWegtVAVnmbf8NPNavCgjC3BiXQ== X-Received: by 2002:a17:906:c091:b0:931:3a85:d0c0 with SMTP id f17-20020a170906c09100b009313a85d0c0mr2613476ejz.36.1679133917323; Sat, 18 Mar 2023 03:05:17 -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 z3-20020a170906434300b008d427df3245sm2008826ejm.58.2023.03.18.03.05.16 for <62252@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 03:05:17 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 18 Mar 2023 07:51:37 +0100 MIME-Version: 1.0 Message-ID: <06d2244c2f38722ef8d12f8ea184faf0c3edef42.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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 1633cec7a6..629789cfa5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8047,29 +8047,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/")