From patchwork Sun Dec 11 22:25:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45181 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 786F427BBEC; Sun, 11 Dec 2022 22:27:34 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 B7DB627BBE9 for ; Sun, 11 Dec 2022 22:27:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Umm-0005Uj-Mk; Sun, 11 Dec 2022 17:27:04 -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 1p4Umk-0005Ts-Kn for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 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 1p4Umk-0004R5-DE for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Umk-0003z4-98 for guix-patches@gnu.org; Sun, 11 Dec 2022 17:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 5/6] gnu: python-astropy: Update to 5.1.1. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756415287 (code B ref 59978); Sun, 11 Dec 2022 22:27:02 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:04 +0000 Received: from localhost ([127.0.0.1]:48570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Uln-0003yE-Da for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:51950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulh-0003wo-E0 for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:59 -0500 Received: by mail-wm1-f47.google.com with SMTP id bg10so3874557wmb.1 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=D0F5GXA+xUa6f+G1l1ZzJR/mg7pexf8LtpDuA0CPkgc=; b=o7fHmtoRHn8N3dXbaZaaNwsh1x5p+1fW4ENbSDDetvaID37MkdpTbQVgXqFas8KE8n pS3jue4BehYI8CmvAJylFKNozEqfI3i9GwtzHQUWRCf6NNnTH+U3rccDlBStvta9Mh27 9teW+kgcGCzX1bAs0I9G/+xV6lJbbf7Xhe3A5ZZapjxAMdxxg9I7bHovvhwk013tYeNf /2TWK7xIQRIfF0etDg1qXB1jbE8S+AjjBvIq+HejRuxmU5dqNzUBgeRZ4KEhNeq3Uc+P GGTDwaTBpvaaKYAqxtrKHYWpMjRTfJA6DIEqQ5v6kPUbHGNQhW4tZnlWAbXt9OfdytrH 7kMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=D0F5GXA+xUa6f+G1l1ZzJR/mg7pexf8LtpDuA0CPkgc=; b=zZbx1JWA642wte8lnzbv91U12me0irNvfWaCmQtPR7CgEF0PAy2mZuROO+y/G9lRuB hWiLJk51NM4zs+8YBOAfGG8XmeqziGL/1jB2QPnQryGVyLk4P2gnDaAAipZGV6jYjfgq Nq33HFiNse92aemFu0UOdbWAuyDAmmXKTHJkWW1DEFvZe8cFUyj5/IGm1xJVi9ys4Dp+ Ju7VO/0cxVCiboEHuY+j07EO8+vhFxOssjgbsNjvd8PeFTjs3wcFPNRMYDWZ70QHeiVB 0p3IN0mqF7y2GEzPEe9JGfAyN+55FDvzVPczB+pTgXpiUjIVwCSSstEB2gfahtmSBgpi soAQ== X-Gm-Message-State: ANoB5pnaYjcIldpDk4jybCwgG2osmwD+Y4q4MTOQiUT+3bNgMrdkb1do IwVCid/Ke4fn0N2ONlq7kR7C390ar1Y= X-Google-Smtp-Source: AA0mqf5/V7bwSyyJRhhDJLj094UWW9wnOU6B2qz3mPLRGmmrbutna5NoKP7Juk8jZkX86H1kT4cRcA== X-Received: by 2002:a05:600c:5405:b0:3d0:47c:9fe7 with SMTP id he5-20020a05600c540500b003d0047c9fe7mr10567425wmb.40.1670797551887; Sun, 11 Dec 2022 14:25:51 -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 r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:51 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:44 +0000 Message-Id: <20221211222545.32318-5-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221211222545.32318-1-sharlatanus@gmail.com> References: <20221211222545.32318-1-sharlatanus@gmail.com> 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.1.1. [source]{snippet}: Unbundle wcslib. [arguments]{phases}: preparations: Use all system libraries. [inputs]: Add wcslib. --- gnu/packages/astronomy.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1876b0cde0..030ae9b4ea 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -982,25 +982,23 @@ (define-public celestia-gtk (define-public python-astropy (package (name "python-astropy") - (version "5.1") + (version "5.1.1") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "0zkv3ddzlxx21i796azfbqxrqnsxn83vsczscv577iyzxp3v5c8x")) + (base32 "10dxjim60ch4qznqa5s63q936mkvy95p0k26kcwzv43hmybdcjxs")) (modules '((guix build utils))) (snippet '(begin ;; Remove Python bundles. (with-directory-excursion "astropy/extern" (for-each delete-file-recursively '("ply" "configobj"))) - ;; Remove cextern bundles and leave the wcslib bundle. Astropy - ;; upgrades to different versions of wcslib every few releases - ;; and tests break every upgrade. - ;; TODO: unbundle wcslib. + ;; Remove cextern bundles. Check bundled versions against available + ;; in Guix in the future update of astropy. (with-directory-excursion "cextern" - (for-each delete-file-recursively '("cfitsio" "expat"))) + (for-each delete-file-recursively '("cfitsio" "expat" "wcslib"))) #t)))) (build-system python-build-system) (arguments @@ -1008,10 +1006,8 @@ (define-public python-astropy (modify-phases %standard-phases (add-after 'unpack 'preparations (lambda _ - ;; Use our own libraries in place of bundles, with the - ;; exception of wcslib. - (setenv "ASTROPY_USE_SYSTEM_CFITSIO" "1") - (setenv "ASTROPY_USE_SYSTEM_EXPAT" "1") + ;; Use our own libraries in place of bundles. + (setenv "ASTROPY_USE_SYSTEM_ALL" "1") ;; Some tests require a writable home. (setenv "HOME" "/tmp") ;; Relax xfail tests. @@ -1058,7 +1054,7 @@ (define-public python-astropy python-sgp4 python-skyfield)) (inputs - (list cfitsio expat)) + (list cfitsio expat wcslib)) (propagated-inputs (list python-configobj python-numpy