From patchwork Wed Dec 20 00:53:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57849 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 608D427BBEB; Tue, 19 Dec 2023 21:56:35 +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=-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=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 1750227BBE2 for ; Tue, 19 Dec 2023 21:56:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFi4X-0004va-9i; Tue, 19 Dec 2023 16:56:17 -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 1rFi3Y-0004No-2K for guix-patches@gnu.org; Tue, 19 Dec 2023 16:55:18 -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 1rFi3V-0003Q4-Ry for guix-patches@gnu.org; Tue, 19 Dec 2023 16:55:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFi3X-0005mt-P7; Tue, 19 Dec 2023 16:55:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67915] [PATCH 32/32] gnu: python-regions: Use G-expressions. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 21:55:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67915 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67915@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 67915-submit@debbugs.gnu.org id=B67915.170302291122155 (code B ref 67915); Tue, 19 Dec 2023 21:55:15 +0000 Received: (at 67915) by debbugs.gnu.org; 19 Dec 2023 21:55:11 +0000 Received: from localhost ([127.0.0.1]:37690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFi3S-0005kx-Ji for submit@debbugs.gnu.org; Tue, 19 Dec 2023 16:55:11 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFi2d-0005dB-4o for 67915@debbugs.gnu.org; Tue, 19 Dec 2023 16:54:20 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40d190044c5so30999065e9.2 for <67915@debbugs.gnu.org>; Tue, 19 Dec 2023 13:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703022850; x=1703627650; 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=AdhLgsqilQM4zgl94QVPZ1wQ1Rq0BrsZaiAlxjD0erk=; b=QNc2ZsWWQekZyxq05RlzIEUYkFPai1tlJnbtoU33yK34nPb0HqHBYuv6S1J1BYZbJ4 YhZV0/Q+qh5xGGzTSFlayuBBcLmUlgtacCyUC5buVPtX0zwHLd3q6quBnveGqH5v52vq /9yuTYDKAyk6P/fvvx0npzIOZ4Z9YLLhmJv2PI6nvligJpsRYswVfm6jmMUOvbVeNOeA yI4dBagDAilc0E/gOz4aXg3LmjtQQXTXZj7zV46dK+prmY82PZYx0JN15ePrREHu2uot uvKolAYVcsk8s96bRXuPTYRXWHaCpI6Uqiq1MC8tWHVPP+opic5yrenvI0lIlQiHOmfS DHqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703022850; x=1703627650; 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=AdhLgsqilQM4zgl94QVPZ1wQ1Rq0BrsZaiAlxjD0erk=; b=AQOcIfH/GIwxvYRjmHBn73a4PeEfvHa7QicCqTklMM1BtntY58Ju3eBEDDUEeFfxNq +HbFfnXP4K0HEDxp4SEZwsiFhtTvMjrS3CDYb329SXKG1qIcHNmNjGGLjpV30w9UoaN7 QsfMCpIZR+PpBz1VIIrlSDEVZN+As9V+jpfzvG+AqGU94L1l1Jn6Fhsixan3nDK5nMt2 8StMNbH9bFoJg3SqSARjAUnP/2DD/PGh5LMFfuByiWwpXCtPT8Sf2kLxEFtn9wDJm1kO dHE4BVtswGGAK2xe59thpt0tgDTasUpPnpIPIAn33Am+w8pr8hXhac4f0i4GOBeJDyzg TasA== X-Gm-Message-State: AOJu0YxsDIJutByS4FYYcjOwSfPq9dXAETdFMFCbrBraQstt/oH+mUgI RigZJv2w+3x0XPifSKSx1ryyrcOM3kFEjg== X-Google-Smtp-Source: AGHT+IF9l3SLjrQzMNPq6mD9qu9UlIs9HarQ2m5wadcOKph6Ej06qFWQFKXUtMf48lJS4xWBOH0V9A== X-Received: by 2002:a05:600c:3b06:b0:40b:2a15:9b30 with SMTP id m6-20020a05600c3b0600b0040b2a159b30mr9625590wms.1.1703022850602; Tue, 19 Dec 2023 13:54:10 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id a8-20020a05600c348800b0040b4b66110csm4799867wmq.22.2023.12.19.13.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 13:54:10 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 20 Dec 2023 00:53:39 +0000 Message-ID: <9f24041343b305db612d08ba6b7e64b7cc737edf.1703031694.git.sharlatanus@gmail.com> 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-regions): Use G-expressions. [build-system]: Swap to pyproject-build-system. [arguments]<#:phases>: Remove 'delete-doctest phase. Merge all (add-before 'check ...) phases into 'prepare-test-environment. Change-Id: I31dc6a195a6f6f818303d5c0e32799770cd448c8 --- gnu/packages/astronomy.scm | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 76c60ca0a7..9b842621ee 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2283,21 +2283,20 @@ (define-public python-regions (uri (pypi-uri "regions" version)) (sha256 (base32 "09401pz7926zlci7cznd78hmv9947f6jxyy2afqdqc1xaccpzcq2")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:test-target "pytest" - #:phases - (modify-phases %standard-phases - ;; This doctest requires online data. - (add-after 'unpack 'delete-doctest - (lambda _ (delete-file "docs/masks.rst"))) - ;; This file is opened in both install and check phases. - (add-before 'install 'writable-compiler - (lambda _ (make-file-writable "regions/_compiler.c"))) - (add-before 'check 'writable-compiler - (lambda _ (make-file-writable "regions/_compiler.c"))) - (add-before 'check 'writable-home - (lambda _ (setenv "HOME" (getcwd))))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; This file is opened in both install and check phases. + ;; XXX: Check if it is still required. + (add-before 'install 'writable-compiler + (lambda _ (make-file-writable "regions/_compiler.c"))) + (add-before 'check 'prepare-test-environment + (lambda _ + (setenv "HOME" "/tmp") + (make-file-writable "regions/_compiler.c") + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (propagated-inputs (list python-astropy python-h5py