From patchwork Sun Dec 11 22:25:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45176 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 8D8BB27BBEC; Sun, 11 Dec 2022 22:26:18 +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,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 06A5A27BBE9 for ; Sun, 11 Dec 2022 22:26:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Ulp-0005Dt-O0; Sun, 11 Dec 2022 17:26:05 -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 1p4Uln-0005Co-NX for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -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 1p4Uln-0004DJ-Dp for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Uln-0003y7-9f for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 3/6] gnu: python-fitsio: Update to 1.1.8. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:26:03 +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.167079756115234 (code B ref 59978); Sun, 11 Dec 2022 22:26:03 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:01 +0000 Received: from localhost ([127.0.0.1]:48563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulk-0003xZ-J6 for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:00 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:35423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulg-0003wm-9r for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:56 -0500 Received: by mail-wm1-f45.google.com with SMTP id h8-20020a1c2108000000b003d1efd60b65so3765050wmh.0 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:56 -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=wtMnZqFDr68/Qy12rl0LSNX8ypI38R44gKqcobTM6Qg=; b=SS2oCSgu4tyzuoTvooWT0NtHMHGBQ7Xfr37Pc6sxBTK4mE4Kr3MzLeHwLVw3XaXGP7 sAgMPTwR1sxzPvv5UhqnHyxeMMPAgXm/LNe0OiR+HTYiKSJ+Y/JeJS9Sud11V96Y8JCU ooWaTjJkntq9H4eemOM0wS3YWHCaUY/QECPwfW5pORn/nli8B+tdCCzY4RpjBdQou0s+ 7mAnzBjymzXlRNihj6h4RSRaZJla3/O//CZ5z2yL0m0dqru5s74fUxoF+tZMl0EhyCkc W+RGfkg6xErcSOblcWSbxBWp0hrE511cRWmoDeUZRKaKvHCYr8xh1AQtKUPhoJFUTJxv a52Q== 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=wtMnZqFDr68/Qy12rl0LSNX8ypI38R44gKqcobTM6Qg=; b=MjSRy2UINFZYXj4uyH6xCdyNoqEgd84iyKtyMPEL16VGZoAiF/p6fpc17Cs4rALsc2 55pHe6ZOCxUI3ZrTbVwcPU5e4R4AK1f5I+E5Qg91BtBfRpunr8KZIP/S/a5i0WyXLP9N mr+L+J809zCx/NH3EJBY4Ru+ulUW6coAMx3UuRh6+kbbL8ixxaIaMx46DUjOalQu155s JVKX7p/UxfWOsOkHU355zHdkWOrdTtyDE9qPkkyy8y5kQU9s8jUBw7jWrJAWx2tZiUIL vaA1VBHmXfFb3vc5bSK1I4/I7dI4tA4gz09z8Uu5FwTb253SN3YbS/x8w+75aOupr1vh M5Ww== X-Gm-Message-State: ANoB5pmqtzhSp1E/hlCCy5kSU7GHVL8XlsA/JmmQ8F+NzMPhPJ16yNxn lpk5P6hbAYpANqqSxLkf8smurO8z9O8= X-Google-Smtp-Source: AA0mqf5H9dCIzGX16aG05UAaZ82ziCdhaalOqoDF/N03+ocScQTo3cKgXxRqLjzFwiws6NA04iPROA== X-Received: by 2002:a05:600c:6899:b0:3d1:cf66:3afa with SMTP id fn25-20020a05600c689900b003d1cf663afamr10650985wmb.19.1670797550656; Sun, 11 Dec 2022 14:25:50 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:50 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:42 +0000 Message-Id: <20221211222545.32318-3-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-fitsio): Update to 1.1.8. [arguments]{phases}: skip-bzip2-test remove redundant phase as cfitsio built with bzip2 support. [inputs]: Add curl-minimal. --- gnu/packages/astronomy.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 794e5ca2b9..5ce94a1f07 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -400,13 +400,13 @@ (define-public cfitsio (define-public python-fitsio (package (name "python-fitsio") - (version "1.1.7") + (version "1.1.8") (source (origin (method url-fetch) (uri (pypi-uri "fitsio" version)) (sha256 - (base32 "0q8siijys9kmjnqvyipjgh6hkhf4fwvr1swhsf4if211i9b0m1xy")) + (base32 "1y80hgvlkjz1bijfyb2j03853yc1kc63yrf9ab7as31ad2r6kxb1")) (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio @@ -430,13 +430,8 @@ (define-public python-fitsio (("self.system_fitsio_libdir = None") "pass") (("self.use_system_fitsio") "True") (("self.system_fitsio_includedir") includedir) - (("self.system_fitsio_libdir") libdir))))) - (add-after 'unpack 'skip-bzip2-test - (lambda* (#:key inputs #:allow-other-keys) - ;; The bzip2 test fails because Guix' cfitsio - ;; is built without bzip2 support. - (substitute* "fitsio/test.py" - (("'SKIP_BZIP_TEST' in os.environ") "True"))))))) + (("self.system_fitsio_libdir") libdir)))))))) + (inputs (list curl-minimal)) (propagated-inputs (list python-numpy cfitsio)) (home-page "https://github.com/esheldon/fitsio")