From patchwork Sat Apr 20 23:22:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 63224 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 901A027BBE9; Sun, 21 Apr 2024 00:26:41 +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=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 D6DBC27BBE2 for ; Sun, 21 Apr 2024 00:26:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryK6A-0004gD-Ce; Sat, 20 Apr 2024 19:26:22 -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 1ryK64-0004bm-2A for guix-patches@gnu.org; Sat, 20 Apr 2024 19:26:16 -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 1ryK63-0002xn-Q4 for guix-patches@gnu.org; Sat, 20 Apr 2024 19:26:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryK6I-0000Xq-II; Sat, 20 Apr 2024 19:26:30 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70489] [PATCH 35/47] gnu: python-regions: Update to 0.9. 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:30 +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.17136555621659 (code B ref 70489); Sat, 20 Apr 2024 23:26:30 +0000 Received: (at 70489) by debbugs.gnu.org; 20 Apr 2024 23:26:02 +0000 Received: from localhost ([127.0.0.1]:39057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryK5o-0000QB-1I for submit@debbugs.gnu.org; Sat, 20 Apr 2024 19:26:01 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryK3R-0008RV-G9 for 70489@debbugs.gnu.org; Sat, 20 Apr 2024 19:23:39 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3499f1bed15so2293581f8f.1 for <70489@debbugs.gnu.org>; Sat, 20 Apr 2024 16:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713655393; x=1714260193; 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=Ian1VSSDf0dTJ22syB6HvWc1Kin7Wk0evbwdXcllAmY=; b=K7n2JPwRvIBXWAzQCoywDPGXEf2HH+iD0HGzFFD17kngtGk6yWihrnaFl6YHyn25sW NW2X6Y6Wua/O1d608bUo5JeiCbda+ycNJO87Rl7FOT90xWUuA4diyTGvNhC0z0mkOS+2 INqrFayUNivMYM5i8i3p0JTXLjq+1tsJBKxrHQ4ks2doAo4fbLCrxsCOrX12tfiXS3QQ TNrT2d4TleBYy9r3KMVXWcDanDJlpdNKNa6TA2jfocl/CqJ0P7bitAXq/a7EUevwehN0 DIz979RydQzfgHxkCdy7Z3ChAUhPMy2eD2qD9yfK2P9aap1LLQ01A9tgSov0uIpMQ6+U 4hEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713655393; x=1714260193; 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=Ian1VSSDf0dTJ22syB6HvWc1Kin7Wk0evbwdXcllAmY=; b=tabzn0tdH1EUfLs40B3Sb7MCuG7ygpWVpPAvB6ruSnUCeAdN4XbuC62Rl/hKvH9aEm WUp6HwtQPaoSZTVKBT4f0HOGJiZ6q9lGQ1AykjgMKGthIGQmuZMuuVKJYaNw4DtKpX0c 3CgRa3gSWqCXT4jd2z9eSvnkcZXMpfGgorOVPjG2qguGmnTO1UBmlRmpGN6vhneSZXtZ /1MOkBNkK+9/qiMaGPIGoAn68hqUKHUDneaGO6bOOfWrcEfPBeiZQJ7mQYpLp3cIreXS pC5/AWadp2hwYKxgTxqd/JDGcnKiLmxkOfDasoAhmtphBEfTxXqDdV/xx2sd6d6utzm8 Wdvg== X-Gm-Message-State: AOJu0Yx+MS2UHMvxL9eeUsmBuGH8fcHSKYZDFCXnA3Wqdwy1x9bcd02g oKZLf3jhTVRfT1tPHLAOjnMnb844ozeh2Q9QpVEjg7RqTXx9ydYvjPHC2NlT X-Google-Smtp-Source: AGHT+IF0I33UBWwXn48mhxfIcC8gDso8KYJ+qZHDRjG6wOKbnct7DyjXlvpTo3ZLHhjwAmNNqql9GQ== X-Received: by 2002:a5d:4a8e:0:b0:343:ce15:fd3f with SMTP id o14-20020a5d4a8e000000b00343ce15fd3fmr7605522wrq.29.1713655392747; Sat, 20 Apr 2024 16:23:12 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Apr 2024 16:23:12 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 21 Apr 2024 00:22:24 +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-regions): Update to 0.9. [arguments] <#:phases>: Add 'create-setup.py phase, rename 'prepare-test-environment to 'build-extensions to reflect purpose. [native-inputs]: Remove python-cython; add python-cython-3. Change-Id: Ia634f93336eb7658c4eaeeb7ddb6539c2e0adee3 --- gnu/packages/astronomy.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 10eb640e56..fe1bc54157 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2667,13 +2667,13 @@ (define-public python-pyvo (define-public python-regions (package (name "python-regions") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (pypi-uri "regions" version)) (sha256 - (base32 "09401pz7926zlci7cznd78hmv9947f6jxyy2afqdqc1xaccpzcq2")))) + (base32 "0kvfdzqry3vcvphd7ldmppbgn3ab97hbfzwxfrlxls92yi41h3i6")))) (build-system pyproject-build-system) (arguments (list @@ -2681,14 +2681,21 @@ (define-public python-regions #~(list "-n" "auto") #:phases #~(modify-phases %standard-phases + ;; setup.py was removed in 84c80a280431adda00641cda5264c7de18b43b2f + ;; for some unknown reason, which caused the package to fail to + ;; build. It is being recreated based on that commit. + (add-after 'unpack 'create-setup.py + (lambda _ + (call-with-output-file "setup.py" + (lambda (port) + (format port "from setuptools import setup +from extension_helpers import get_extensions +setup(ext_modules=get_extensions())"))))) ;; 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 + (add-before 'check 'build-extensions (lambda _ - (setenv "HOME" "/tmp") - (make-file-writable "regions/_compiler.c") (invoke "python" "setup.py" "build_ext" "--inplace")))))) (propagated-inputs (list python-astropy @@ -2698,7 +2705,7 @@ (define-public python-regions python-scipy python-shapely)) (native-inputs - (list python-cython + (list python-cython-3 python-extension-helpers python-pytest-arraydiff python-pytest-astropy