From patchwork Mon Mar 3 14:02:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 39642 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 7CE1D27BBEA; Mon, 3 Mar 2025 14:05:11 +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=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 81F8927BBE9 for ; Mon, 3 Mar 2025 14:05:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tp6Ps-0006l6-Nn; Mon, 03 Mar 2025 09:05:09 -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 1tp6Oq-0006WX-1Z for guix-patches@gnu.org; Mon, 03 Mar 2025 09:04:07 -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 1tp6Op-0005C1-5E for guix-patches@gnu.org; Mon, 03 Mar 2025 09:04:03 -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=j+E9f0pwgRL1eWwOKJOpMlOec7BhkUNiceE1jHfZ3AM=; b=TcRpacDE4hZeu9HWD4c7XqcnJ+mQuOX1fEjT4zs29NKK7FOohPLvEwzZTEBqLel61cnYvboUBCaS+m9oJdtptMespFlSHKik9fdUl1KTTNcIutyyObw8bhwe69Tv9GxZ+HHn1bsB2SCKNizJd371GzxIgcrgV0CN2XcGDaVFTWSIfeNbc9hmwfvviGL12UZqslo9EHip0z5jY+IbVnDv8rdISi2NaIK8wHcgDbgdudLj8m9d2WdDePu/9xgv/SZDBALn4id5U69uqb/GdtXueGN9zyBF1DbmNH0ovge35ziGZ06cHTji6FQnoN5EV+Q1NMzei6hVjQmudqA/vsk12Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tp6Oo-0005FK-CL for guix-patches@gnu.org; Mon, 03 Mar 2025 09:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76712] [PATCH 7/7] gnu: python-scooby: Update to 0.10.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Mar 2025 14:04:02 +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.174101058820022 (code B ref 76712); Mon, 03 Mar 2025 14:04:02 +0000 Received: (at 76712) by debbugs.gnu.org; 3 Mar 2025 14:03:08 +0000 Received: from localhost ([127.0.0.1]:46545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tp6Nv-0005Cs-MX for submit@debbugs.gnu.org; Mon, 03 Mar 2025 09:03:08 -0500 Received: from mout02.posteo.de ([185.67.36.66]:45627) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tp6Nt-0005B6-HG for 76712@debbugs.gnu.org; Mon, 03 Mar 2025 09:03:06 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B3611240103 for <76712@debbugs.gnu.org>; Mon, 3 Mar 2025 15:02:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1741010579; bh=N/Es4Ed81+LCXzUaCoaVrf6MSRfb14rS7W/9xTv0OeQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=fzVf5FFmadLI5e9wkaFS0Fr9pK77XLEiVWC7ZH+Rro7kY1zRs+etVru+4x/+BZVfN MhGwGpFEYLfRZG27Osn1BLIH6Y/JC5arPDUGO9NHcWIF532pHkX/yMg6UA6zh8mTjZ C+TVxBfTyr5+euto9A4GjPzo/BneRiFpZh6ONMbIkK7lUVag9DbrMIY/elcJBygkeF j5EEoBweU2/HS7R67G6Kt5x/CfUewZpinQMSAEkBbTNE6CAYur53vZh+XJKEEvb0PR r/viJDtnBeSLuuYXtmlBl/wvXtkRNuZXj7zM2BD4HXc1wabyS/F0LkcR+ecdfY8pz2 QlWaEtM9wyykg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Z60rf5xqYz9rxG; Mon, 3 Mar 2025 15:02:58 +0100 (CET) From: Vinicius Monego Date: Mon, 3 Mar 2025 14:02:15 +0000 Message-ID: <46b9ebe0a3d12946531d376fcfafce11df5c9ad4.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-scooby): Update to 0.10.0. [build-system]: Use pyproject-build-system. [native-inputs]: Add python-no-version, python-pytest-console-scripts, python-setuptools, python-wheel, python-time. [arguments]: Move below build-system. Remove 'fix-tests and custom 'check phase. Skip a failing test. * gnu/packages/python-xyz.scm (python-no-version): New variable. Change-Id: Idbab8d0eaedd5f0fcbaa71de052de7c5c74c0da1 --- gnu/packages/python-xyz.scm | 54 +++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7a3dcc0c76..4b3468348a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -39080,7 +39080,7 @@ (define python-pyvips-for-python-scooby (define-public python-scooby (package (name "python-scooby") - (version "0.5.12") + (version "0.10.0") (source ;; The PyPI tarball does not contain the tests. (origin @@ -39090,33 +39090,27 @@ (define-public python-scooby (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gkpmz8wl3jg8ylf1na35308sznw2g9wx33zqlyq5i2gpy2ml9mw")))) - (build-system python-build-system) + (base32 "10d9j9anhgfhqg7rs34pld7ivyja2plz7z4bzdjsvkwgq8vlny19")))) + (build-system pyproject-build-system) + (arguments + (list + ;; FIXME: This test uses pytest-console-scripts in subprocess mode to + ;; call the 'scooby' executable. Check why this failed. + #:test-flags #~(list "-k" "not test_cli"))) (native-inputs (list python-beautifulsoup4 + python-no-version python-numpy python-pytest + python-pytest-console-scripts python-pytest-cov python-pyvips-for-python-scooby - python-scipy)) + python-scipy + python-setuptools + python-wheel + time)) (propagated-inputs (list python-psutil)) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "tests/test_scooby.py" - ;; The test suite uses the no-version PyPI package - ;; (https://pypi.org/project/no-version/), - ;; but it doesn't seem worth packaging in Guix just for this. - (("scooby\\.report\\.VERSION_NOT_FOUND") - "scooby.report.MODULE_NOT_FOUND") - (("^ +import no_version # noqa.*") "")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) (home-page "https://github.com/banesullivan/scooby") (synopsis "Report hardware information and Python package versions") (description @@ -39239,6 +39233,26 @@ (define-public python-catalogue Pickle for serialization, which has many drawbacks.") (license license:expat))) +(define python-no-version + (package + (name "python-no-version") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "no_version" version)) + (sha256 + (base32 "1y58fkwg4s96hbz3hnqj2nd8a0pimrmpk4ry1z5pwzxlyx0k66rf")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ; this is a dummy package + (native-inputs (list python-setuptools python-wheel)) + (home-page "https://github.com/prisae/no_version") + (synopsis "Package without __version__ number") + (description "This is a dummy package that does not contain a version +number, only useful for testing purposes.") + (license license:cc0))) + (define-public python-wasabi (package (name "python-wasabi")