From patchwork Wed Jul 26 23:15:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 52204 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 13B2B27BBE9; Thu, 27 Jul 2023 00:22:04 +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 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 5EFBF27BBE2 for ; Thu, 27 Jul 2023 00:22:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOnkj-0002nB-2I; Wed, 26 Jul 2023 19:17:09 -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 1qOnke-0002kp-Pc for guix-patches@gnu.org; Wed, 26 Jul 2023 19:17:05 -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 1qOnke-0001Dq-IM for guix-patches@gnu.org; Wed, 26 Jul 2023 19:17:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qOnke-00042g-Ec; Wed, 26 Jul 2023 19:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64201] [PATCH v2 08/22] gnu: python-astropy: Update to 5.3.1. 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: Wed, 26 Jul 2023 23:17:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64201@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 64201-submit@debbugs.gnu.org id=B64201.169041337115322 (code B ref 64201); Wed, 26 Jul 2023 23:17:04 +0000 Received: (at 64201) by debbugs.gnu.org; 26 Jul 2023 23:16:11 +0000 Received: from localhost ([127.0.0.1]:40212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOnjm-0003yy-VM for submit@debbugs.gnu.org; Wed, 26 Jul 2023 19:16:11 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:55460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOnjd-0003uu-Nd for 64201@debbugs.gnu.org; Wed, 26 Jul 2023 19:16:02 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fde57684d7so2856365e9.2 for <64201@debbugs.gnu.org>; Wed, 26 Jul 2023 16:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690413356; x=1691018156; 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=agkbMecRD4YDVP7uMaRzNZLiHrS1Z4CHrpIOX0WKw4A=; b=VUcQDpS/GaKdNwHDu53lQ3t0+9ju1nXxuD7f8Jmh14cyWmtqxGpDFg3amiwdmf5Y0j wrDA8WMxKftfGC3AdsjWBdM1Z1hrm+lwurDsVIpLjc0bS15dbbnrMgBxz+qhXydsGsMi Sdujncrlk4rhKV5ZM2YsPZETutVGTbzxhSTvVV4xiVo73H1CuQtRcnzXVV7SFqPNkcIQ FdWFzDsqEAxvXn+UYE5CnT960rldgmwpNVzRC1Xfnl05n1krzuPoVJreO4xQp4ek+TRa hvH+A9AY1Qcvej/lOUyqKQowt9aHaQljFd5z4gbK5PiEGbhH29atwPFPU5FBxyrvCoZe SCJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690413356; x=1691018156; 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=agkbMecRD4YDVP7uMaRzNZLiHrS1Z4CHrpIOX0WKw4A=; b=YtobuE/70jN+FgKhfcE/3fa3qShtByNGWwAO5hTm69nz8IzlSPg8mMOCvmHe2YLRTF xyLs4BPwwBp4rwDJVmmusNqCCTwPZu0x/j6ojvfVasMMgcHoixhAobO1nMyFYbB9zVBR 1z+9VeHniBoi3h4epNSxwzvM9vvDJBBND/Ar1MUDX3TjQq5EESyMLDt6tniARdbIa2KW BKK6ddaqjiykStY+q2MHIqR5ebCeiDbWkmHQcB3cyRyUasmIO6of7jbIgDm6kkhJtV1h G3PTgddXeGPydgJ73cuvg4AQK0/Qi0OLCSLrGvVykJcRrUICmQjfYZsEWzh2xx+cidSv 9VCQ== X-Gm-Message-State: ABy/qLZu8Dm8K8ioIyTxijPzec01w296lB1awdn89J340f/XJRn4lVLl FZDtNg5Epfrlam+U8FHuH3kkhg6X2/h/XQ== X-Google-Smtp-Source: APBJJlHpaOh8DCq6/hvJUknainhh63YoVedfDV/6c8g+uVtu+ZzdIYgCqWQeqVvZWejxQca92wCn5A== X-Received: by 2002:a1c:7512:0:b0:3fc:586:ccb4 with SMTP id o18-20020a1c7512000000b003fc0586ccb4mr312257wmc.36.1690413356157; Wed, 26 Jul 2023 16:15:56 -0700 (PDT) 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 u20-20020a05600c00d400b003faef96ee78sm3147472wmm.33.2023.07.26.16.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 16:15:55 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:34 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 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-astropy): Update to 5.3.1. [snippet]: Remove trailing #t. Prevent cfitsion from deletion. [inputs]: Remove cfitsio. --- gnu/packages/astronomy.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c32f0fc539..a18de38fbd 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1262,13 +1262,13 @@ (define-public celestia-gtk (define-public python-astropy (package (name "python-astropy") - (version "5.2.2") + (version "5.3.1") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "170ddflli35mvhf6pla7aizfw8a7ckq66g1mi1br99dx2r3y7ag6")) + (base32 "0x4dh7wx9sn1gy6sl2d54zsd24cgfjwrlk6kfrwpzzrmbsv22lwv")) (modules '((guix build utils))) (snippet '(begin @@ -1277,9 +1277,12 @@ (define-public python-astropy (for-each delete-file-recursively '("ply" "configobj"))) ;; Remove cextern bundles. Check bundled versions against available ;; in Guix in the future update of astropy. + ;; + ;; cfitsio build is only available from non-publicly exposed + ;; bundled short version. See: + ;; https://github.com/astropy/astropy/pull/14311 (with-directory-excursion "cextern" - (for-each delete-file-recursively '("cfitsio" "expat" "wcslib"))) - #t)))) + (for-each delete-file-recursively '("expat" "wcslib"))))))) (build-system python-build-system) (arguments `(#:phases @@ -1346,7 +1349,7 @@ (define-public python-astropy python-skyfield python-timezonefinder)) (inputs - (list cfitsio expat wcslib)) + (list expat wcslib)) (propagated-inputs (list python-configobj python-numpy