From patchwork Wed Jun 21 06:33:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 51132 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 2393227BBE2; Wed, 21 Jun 2023 07:38:02 +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 6E5FC27BBEC for ; Wed, 21 Jun 2023 07:37:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBrRL-0001iR-IS; Wed, 21 Jun 2023 02:35:39 -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 1qBrR6-0001eB-VQ for guix-patches@gnu.org; Wed, 21 Jun 2023 02:35:34 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBrQm-00066U-NX for guix-patches@gnu.org; Wed, 21 Jun 2023 02:35:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBrQm-0007jU-J6; Wed, 21 Jun 2023 02:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64201] [PATCH 07/20] gnu: python-astropy: Update to 5.3. 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, 21 Jun 2023 06:35: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.168732926229507 (code B ref 64201); Wed, 21 Jun 2023 06:35:04 +0000 Received: (at 64201) by debbugs.gnu.org; 21 Jun 2023 06:34:22 +0000 Received: from localhost ([127.0.0.1]:60356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBrQ5-0007fl-IZ for submit@debbugs.gnu.org; Wed, 21 Jun 2023 02:34:21 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:48301) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBrPy-0007dW-7G for 64201@debbugs.gnu.org; Wed, 21 Jun 2023 02:34:14 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-307d20548adso4449432f8f.0 for <64201@debbugs.gnu.org>; Tue, 20 Jun 2023 23:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687329248; x=1689921248; 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=Gl6uaEDvh4tDNdo2UIZr8364Ml7w7agulQAgvPz4H60=; b=po6RuM6MDRNqOZJLU9gjKFI6dG1uG4QCzT1WI0M6rPbIik6hE3n82zGvvBV6XGe2j0 eozx2sdVio6ACBAqeIkRRQvFq+JvYq2N6K/TcBvyrKvCa/tf3kScmzH/vPeCWLKw655N m3ipifRBaz4CfaPrd/HoMzqXJKn+oTvgQCAElJeWSbsQ1eFdtWxoMpMG8LFddWGjiAUF Bsxdc9vFnE6ywwsC3OtJF3MEs5H56kl5FIuiizNKD6Q/SSLHXezKGgks0gYbFZvfj8cz lx9L8uD5DKtMM4i5p72AR21owHtQD5d+t/d2gzukTSYmRRXIiZB08Dlke0YejgF1hudE XB/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687329248; x=1689921248; 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=Gl6uaEDvh4tDNdo2UIZr8364Ml7w7agulQAgvPz4H60=; b=TresUR9k1oy3B91BdkluaRPZGeLjwc4mkfaZjvs1A/Z3Z9//M+TTU/y0nio+kuFzwO RKinWDrwYRFMBYTtdq6xtw+L1DwHhwfuln5MOTXCWeWm1vIVj9Ud/s7a0/ZTn/wM/Gus PiYnn1I/9MWyrZkM2QdZ7eloCsxC2pYdDiSJJT6x0YlGndwTaxaTYwBd8B7g5+1VG4w/ RninRlQBEr3B9CEWm9kz0P3O/7ml0t4ssIXLGoynhgi4n8zFSOWMZFaw4c7k95C2a5fl VZrVoLEOvwFZLtuH5iQcyyz3uOvsA//2wEDJyP0rcjEgBPdaXxmKQPA0UrPT4eIZ5CQp CaRA== X-Gm-Message-State: AC+VfDyzU+Gq3OTlPaHgou4/KHkHBuX9UdlqSyLjCmujOt3SbWHtZmG5 FVkm3zm3WxuhNy/sIwfHsuKfjHN61zU= X-Google-Smtp-Source: ACHHUZ4gFKx37MzYd/ACFgW7Pz6nPx5EUEmsmkC1cL2S6k5Ho8pTWiyBeS8N9OehHbv6ixw+dyS9Yw== X-Received: by 2002:a5d:4811:0:b0:306:28f4:963c with SMTP id l17-20020a5d4811000000b0030628f4963cmr9440421wrq.23.1687329248499; Tue, 20 Jun 2023 23:34:08 -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 r15-20020a5d52cf000000b0030af72bca98sm3553471wrv.103.2023.06.20.23.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 23:34:08 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 21 Jun 2023 07:33:46 +0100 Message-Id: <60af0b36cf41d6ac52836b919d21262bb0c79118.1687302523.git.sharlatanus@gmail.com> 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. [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 d6dde400c9..d21ff42690 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1138,13 +1138,13 @@ (define-public celestia-gtk (define-public python-astropy (package (name "python-astropy") - (version "5.2.2") + (version "5.3") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "170ddflli35mvhf6pla7aizfw8a7ckq66g1mi1br99dx2r3y7ag6")) + (base32 "1rg4i5w7mggfvi63j2aj2d2fjikml55bbxswl6n0j8xkqbhlns8z")) (modules '((guix build utils))) (snippet '(begin @@ -1153,9 +1153,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 @@ -1222,7 +1225,7 @@ (define-public python-astropy python-skyfield python-timezonefinder)) (inputs - (list cfitsio expat wcslib)) + (list expat wcslib)) (propagated-inputs (list python-configobj python-numpy