From patchwork Mon Mar 3 14:02:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 39639 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 61DEF27BBEA; Mon, 3 Mar 2025 14:03:55 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C488C27BBE2 for ; Mon, 3 Mar 2025 14:03:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tp6OG-00068g-Ed; Mon, 03 Mar 2025 09:03:28 -0500 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 1tp6Nv-0005yE-Cc for guix-patches@gnu.org; Mon, 03 Mar 2025 09:03:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tp6Nu-000530-Vx for guix-patches@gnu.org; Mon, 03 Mar 2025 09:03:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=6Z2YjRfN8u8TYE4amvuvWwtvhcIEDOBqIZNqBTqO5eM=; b=SWKwnwOcXM3s2yPFFzwExgHcPnRvjImPZZXxKg1shtLp4JuS4GEuILVC9qBLfD7bsPgxNFkeay8cgXQOfwnfMwkz9rjfm0KIV3/ZJrW2UZKxXtIfFDpT8Eu38vFcaljlxd7fIfdc+uywRPtaeQ8+eNMI9w0PN/uto4aW455T/Unnd9xm8h2+w6SFVGiZec8lqMAZiDHXiBnwfgEa1uKJttU7/AzWKuDq6iI0XAoKEAVWs4yPBEQ0Zn3+Sd6ZaLwRbve3uyx3RWgtl42GaSCFPLnTO1gOW2VcqqaEiXy6Ih7SHJA5JYKYEMLxaBaNYVxGyW17a6E001724i1t0tF/Nw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tp6Nu-0005Ca-QI for guix-patches@gnu.org; Mon, 03 Mar 2025 09:03:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76712] [PATCH 6/7] gnu: python-pyvips: Update to 2.2.3. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Mar 2025 14:03:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76712 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76712@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 76712-submit@debbugs.gnu.org id=B76712.174101058519981 (code B ref 76712); Mon, 03 Mar 2025 14:03:06 +0000 Received: (at 76712) by debbugs.gnu.org; 3 Mar 2025 14:03:05 +0000 Received: from localhost ([127.0.0.1]:46537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tp6Ns-0005C1-H3 for submit@debbugs.gnu.org; Mon, 03 Mar 2025 09:03:05 -0500 Received: from mout01.posteo.de ([185.67.36.65]:58627) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tp6Np-0005Al-NB for 76712@debbugs.gnu.org; Mon, 03 Mar 2025 09:03:02 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DE515240027 for <76712@debbugs.gnu.org>; Mon, 3 Mar 2025 15:02:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1741010575; bh=BDXNVpsn7FvGWud+NDIv8/mJbGywTZ30nNYPWlNzLPI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=dZp6/N8n09T30QX6o84YJEyGPMs729LvuoAkJJCWTRYmPA2/PJAeVVtQcBwTS58o4 M/a0/DIQ5eWj5RSf0FbaSa+83738z0pDg+dWVKSnYmJJaiSzYqIdR81xJsrPjolIQC SIboxFew3guQ+gzzj/3hCkIo89Padr3oCEH59c/5AmcEDzFTUr3Ss68vihJm286CTO 4TPMw+UQQHptLHQjloM9TvbORwMTZupawJ1VcmyFZwWT2D9asqP4Pn8VcK4v5SjoqJ mNca25sty/lo8lIcm403+E11Yl3lsbbpe92A4++gA2rn1dYpTdl8ADAKaW12GjZZ+F 7bvg0eEET+vlQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Z60rZ6fFzz6twJ; Mon, 3 Mar 2025 15:02:54 +0100 (CET) From: Vinicius Monego Date: Mon, 3 Mar 2025 14:02:14 +0000 Message-ID: <3989c574eb737b67cff25b1d8f72beda4f7dfc6c.1741010255.git.monego@posteo.net> In-Reply-To: References: MIME-Version: 1.0 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-pyvips): Update to 2.2.3. [source]: Fetch from GitHub. [build-system]: Use pyproject-build-system. [arguments]<:phases>: Delete the now unnecessary 'fix-build, 'fix-paths and custom 'check phase. Also build in API mode. [native-inputs]: Add pkg-config, python-setuptools, python-wheel. Remove python-pytest-flake8, python-pytest-runner. [propagated-inputs]: Add python-pkgconfig. * gnu/packages/python-xyz.scm (python-pyvips-for-python-scooby): Do not delete the phase that was deleted in the parent package. Change-Id: I8b3ac54f5b118a565f7297cf455698e690197e78 --- gnu/packages/python-xyz.scm | 58 +++++++++---------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c15671b53f..7a3dcc0c76 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12071,56 +12071,27 @@ (define-public python-imageio (define-public python-pyvips (package (name "python-pyvips") - (version "2.2.1") + (version "2.2.3") (source (origin - (method url-fetch) - (uri (pypi-uri "pyvips" version)) + (method git-fetch) ; PyPI does not include test helpers + (uri (git-reference + (url "https://github.com/libvips/pyvips") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1dfbwwvnnsk4g2kj1pw654z9jq3mb72l1m8ma29858jpn12vn7dm")))) - (build-system python-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - ;; Maybe switch to API mode (i.e., build the C extension)? - ;; It is advertised as faster to start up and run. - ;; However, even with ‘pkg-config’ and ‘python-pkgconfig’ in - ;; ‘native-inputs’, the API mode build fails with: - ;; - ;; Falling back to ABI mode. Details: unable to find pkg-config package "vips" - ;; - ;; The build doesn't actually fail without the below - ;; substitution, it's just slower because ‘setup.py’ tries - ;; (unsuccessfully) to download the Python ‘pkgconfig’ module. - (add-after 'unpack 'fix-build - (lambda _ - (substitute* "setup.py" - (("^( +setup_)API\\(\\)\n" _ prefix) - (string-append prefix "ABI()\n"))))) - (add-after 'unpack 'fix-paths - (lambda _ - (substitute* "pyvips/__init__.py" - (("^( +_vips_libname) = '(libvips.so.42)'" - _ var libname) - (format #f "~a = '~a/lib/~a'" - var #$(this-package-input "vips") libname)) - (("^( +_gobject_libname) = '(libgobject-2.0.so.0)'" - _ var libname) - (format #f "~a = '~a/lib/~a'" - var #$(this-package-input "glib") libname))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "setup.py" "test"))))))) + (base32 "1ddk9njjc1kqjdmf95mwij83gjg0wg9d8qrl3abm19bmwiq7aq0h")))) + (build-system pyproject-build-system) (native-inputs - (list python-pyperf + (list pkg-config + python-pyperf python-pytest - python-pytest-flake8 - python-pytest-runner)) + python-setuptools + python-wheel)) (inputs (list glib vips)) (propagated-inputs - (list python-cffi)) + (list python-cffi python-pkgconfig)) (home-page "https://github.com/libvips/pyvips") (synopsis "Python bindings for VIPS") (description "The @code{pyvips} package provides Python bindings for VIPS, @@ -39096,9 +39067,8 @@ (define python-pyvips-for-python-scooby (name "python-pyvips-for-python-scooby") (arguments (substitute-keyword-arguments (package-arguments python-pyvips) - ((#:phases phases) + ((#:phases phases '%standard-phases) #~(modify-phases #$phases - (delete 'fix-paths) ;; The checks won't succeed without VIPS. (delete 'check) (delete 'sanity-check)))))