From patchwork Sat Apr 20 23:22:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 63227 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 C5ABA27BBE9; Sun, 21 Apr 2024 00:26:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 7F52527BBE2 for ; Sun, 21 Apr 2024 00:26:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryK6J-0004r5-C5; Sat, 20 Apr 2024 19:26:34 -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 1ryK6A-0004lR-Vp for guix-patches@gnu.org; Sat, 20 Apr 2024 19:26:23 -0400 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 1ryK6A-0002zH-Ll for guix-patches@gnu.org; Sat, 20 Apr 2024 19:26:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryK6P-0000ZX-Hq; Sat, 20 Apr 2024 19:26:37 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70489] [PATCH 45/47] gnu: python-stsci-stimage: Adjust test steps. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2024 23:26:37 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70489 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70489@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70489-submit@debbugs.gnu.org id=B70489.17136555721813 (code B ref 70489); Sat, 20 Apr 2024 23:26:37 +0000 Received: (at 70489) by debbugs.gnu.org; 20 Apr 2024 23:26:12 +0000 Received: from localhost ([127.0.0.1]:39083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryK5x-0000Sk-Vu for submit@debbugs.gnu.org; Sat, 20 Apr 2024 19:26:11 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:46110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryK3Y-0008T2-Ft for 70489@debbugs.gnu.org; Sat, 20 Apr 2024 19:23:42 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-41a2a43c75bso692545e9.0 for <70489@debbugs.gnu.org>; Sat, 20 Apr 2024 16:23:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713655400; x=1714260200; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fn48jM9gpf7jEAe2bk2pnUHy1PVxjufkHo1dLUkg2lc=; b=lR9v3tPM9fm5CBrXIbtYmZLlgNlWBWl0C6T72GKJqmmWR/Ftj1kAs0QQ56Wc7E/NXa LlXcHudiwLN3b/dunWnQgL2aK+GWzYjaTnannIpyxaLCJxJEfb3fN3SQdo4qtmnqKyiC sRxPL/+qoU5kA6HD3DvRgSolJhO8LPUzp6TR9P/xYi1N+9CKV/he2a+THw5Uolp5FXSS FTd2n0podBsK4ajSZGAgjwXbmjO1nPFPIwKaCSLZmdBysQVgNRae4cV3jvf12XxY6iwu SE3PACb19vvJ0YziLkj2h1185upPUhQQi8WEJNhkxgbKRriGAN5xH+I944zPv+Qs2b7J 8J5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713655400; x=1714260200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fn48jM9gpf7jEAe2bk2pnUHy1PVxjufkHo1dLUkg2lc=; b=g4YMVl8sDcOVPKbNTwCmijM411kkVtfNlHuObnnD20SzXa30ZmfL2YnrXv0OK/11lT Uv6fIdJ/uuv2l/DPUPazEzZMP8d9BPJ7O3nkb0IGDd3BiiG1sNk+qxmeF+Bli6tu4tnu ACtsvgpne50A2Axv4xzI//nwFJivJ0pKOTVGEtN7nKnxFP+VeBVpl3WQt7q06KhQ0iDo iDM1j1go2bPWWK96gsZvIPib8ZPZbrYvZok5r3zvlESvqUvzI6pU9iCBlwyzD+dCmeNf lfhlgCRWEM+kn8HZ8iLCvMmjptpshAFll71AUzbxYvYGXGj7e+YqsaDtgXS5PbNaH8Vk A3GQ== X-Gm-Message-State: AOJu0YxhrZyTxIZ5t3XCNFCx2nEiNkv0gevsn7X9cPbknhdeoWv86VJe 6ZD9L+E/Wg0JuLrIFny/0CmljdbJcJUQ0U94MtDs5v9NWw4BB0wTQlGTWEZq X-Google-Smtp-Source: AGHT+IHBR5qxoWrlUmRu3uo1sqs5lr0Qot0uXH6U1VGfz7RNnRsAGdZd0fb7BR4kLpmFd3tnh8Y2vw== X-Received: by 2002:a05:600c:1987:b0:416:bc18:2a00 with SMTP id t7-20020a05600c198700b00416bc182a00mr4306308wmq.38.1713655399807; Sat, 20 Apr 2024 16:23:19 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id g13-20020a05600c310d00b004196c93da22sm6474751wmo.2.2024.04.20.16.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Apr 2024 16:23:19 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 21 Apr 2024 00:22:34 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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/astronomy.scm (python-stsci-stimage): [arguments]: <#:test-flags>: Add them. <#:phases>: Fail over to default 'check phase and add 'waf-configure-build phase before check. [native-inputs]: Remove python-codecov and, python-pytest-cov. [description]: Fix indentation. Change-Id: I350c4ced2cb4afaff72d4d4941d198932cd888f5 --- gnu/packages/astronomy.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b4a82f6353..9d82bd4c89 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3242,6 +3242,8 @@ (define-public python-stsci-imagestats (define-public python-stsci-stimage (package (name "python-stsci-stimage") + ;; PyPI version was 0.2.8 but the latest version tag on GiHub was 0.2.7, + ;; see (version "0.2.8") (source (origin (method url-fetch) @@ -3252,27 +3254,26 @@ (define-public python-stsci-stimage (build-system pyproject-build-system) (arguments (list + #:test-flags #~(list "test_c") #:phases #~(modify-phases %standard-phases - ;; Test steps are taken from GitHub Actions. - ;; See https://github.com/spacetelescope/stsci.stimage/issues/27 - (replace 'check + ;; Test steps are taken from GitHub Actions, see + ;; + (add-before 'check 'waf-configure-build (lambda _ (copy-file (string-append - #$(this-package-native-input "python-waf") "/bin/waf") - "waf") - (invoke "python" "waf" "configure" "build" "do_tests")))))) - (propagated-inputs (list python-numpy)) + #$(this-package-native-input "python-waf") "/bin/waf") + "waf") + (invoke "python" "waf" "configure" "build")))))) + (propagated-inputs + (list python-numpy)) (native-inputs - (list python-codecov - python-pytest - python-pytest-cov - python-setuptools-scm - python-waf)) + (list python-pytest python-setuptools-scm python-waf)) (home-page "https://stscistimage.readthedocs.io/en/latest/") (synopsis "STScI image processing") - (description "This package provides an astronomical Python package with -image processing functions: @code{xyxymatch}, @code{geomap}.") + (description + "This package provides an astronomical Python package with image +processing functions: @code{xyxymatch}, @code{geomap}.") (license license:bsd-3))) (define-public python-stcal