From patchwork Wed Sep 29 08:47:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Hinsen X-Patchwork-Id: 33415 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 C3C8A27BBE3; Wed, 29 Sep 2021 09:52:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 55AD327BBE1 for ; Wed, 29 Sep 2021 09:52:16 +0100 (BST) Received: from localhost ([::1]:59176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVVK3-00020N-9z for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 04:52:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVVJr-0001vN-7H for guix-patches@gnu.org; Wed, 29 Sep 2021 04:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVVJq-0008GU-Ah for guix-patches@gnu.org; Wed, 29 Sep 2021 04:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVVJq-00036p-9c for guix-patches@gnu.org; Wed, 29 Sep 2021 04:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50887] [PATCH] gnu: Add python-fitsio. Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 08:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50887@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163290546411877 (code B ref -1); Wed, 29 Sep 2021 08:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Sep 2021 08:51:04 +0000 Received: from localhost ([127.0.0.1]:47763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVVIt-00035V-SI for submit@debbugs.gnu.org; Wed, 29 Sep 2021 04:51:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:33722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVVIs-00035N-BG for submit@debbugs.gnu.org; Wed, 29 Sep 2021 04:51:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVVIp-0001WF-PM for guix-patches@gnu.org; Wed, 29 Sep 2021 04:51:01 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:52067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVVIh-0007FA-8P for guix-patches@gnu.org; Wed, 29 Sep 2021 04:50:54 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 4824E3201C4A; Wed, 29 Sep 2021 04:50:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 29 Sep 2021 04:50:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= from:to:subject:date:message-id:mime-version:content-type; s= fm1; bh=/ApVXU8GXTipK7+MgVXMlg6I7MxWimsAyLfXuuM0nEs=; b=Mnq/olpQ avm/R0c9ll3uZNotTbF5ps9OfTJVaauYWphb3nxtoMMe9hZOi3FxV0NcuCMHP67A eL27rihBZpvD+uqVt41pmp55ZSDGFTC9t051Iqf1pDlyobicbkOHuJhHO+UL/EjE HJ/nSJ0wOxVWJGv+MPp3u/4lqcflBI2PrNPfpqHH8Tp12gJPfGXz0xf7qlfJLZb3 Jvi+uumiknfvTxc0uq55tbs1lBEdUjQZg3SQD79jMtEO4XWwJlBv9kyERP57OY10 zN4O3gfRvzwh38S3Z0OPL1TiYydjb4h/koYQ49whfY0hRz/9yELVgquqoVXgkI7/ CXOxWR1AXKskMA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=/ApVXU8GXTipK7+MgVXMlg6I7MxWi msAyLfXuuM0nEs=; b=p63SuZZGxTZA0yLZ7x/ESn1fTmuPJsmTaBzRigwEAXbJm ScAdWrpM9+fjLZC5k6My2DiRSERkOI/ykGlioBxkN20gKYNQNQsrIQKADQPztlNl L71BMMzVY3bhkI/9fTe7sQGCjK2uhdOZU5gCDvJzb38qNwC/5TuCnjc9jsHvHn8t 5KuOJESVJ2VT5ckI6sZw2A+XPrIpy6GmjFTBWw9jBC8LMYZVyF4jNJlnvl1YTbiJ dryOfh2bi8WYHQhKN7+QpA5msZjC81ZSyeq3Q1ahYGrSmYmH41PrYzRDUXh2wr4y totSZGYi+MgHcvKDPS9fCZODDSNoENqgcfgeiwzFg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudekvddgtdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkgggtsehttdertddttd dtnecuhfhrohhmpefmohhnrhgrugcujfhinhhsvghnuceokhhonhhrrggurdhhihhnshgv nhesfhgrshhtmhgrihhlrdhnvghtqeenucggtffrrghtthgvrhhnpefffeetuefhkeelud ehjeefkeelvefhkeeklefhgfeljeetgfefveeuleekgedvheenucffohhmrghinhepghhi thhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepkhhonhhrrggurdhhihhnshgvnhesfhgrshhtmhgrihhlrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 29 Sep 2021 04:50:47 -0400 (EDT) From: Konrad Hinsen Date: Wed, 29 Sep 2021 10:47:39 +0200 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.24; envelope-from=konrad.hinsen@fastmail.net; helo=wout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/astronomy.scm (python-fitsio): New variable. --- gnu/packages/astronomy.scm | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a3f7d5cbf4..4fba3aae99 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -96,6 +96,49 @@ in FITS files.") (license (license:non-copyleft "file://License.txt" "See License.txt in the distribution.")))) +(define-public python-fitsio + (package + (name "python-fitsio") + (version "1.1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fitsio" version)) + (sha256 + (base32 "1llql2i6xr9lkdl81jx5nvz80kspamvira90546y32ldy551hq1l")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unbundle-cfitsio + (lambda* (#:key inputs #:allow-other-keys) + (let* ((cfitsio (assoc-ref inputs "cfitsio")) + (includedir (string-append "\"" cfitsio "/include\"")) + (libdir (string-append "\"" cfitsio "/lib\""))) + ;; Use Guix' cfitsio instead of the bundled one + (substitute* "setup.py" + (("self.use_system_fitsio = False") "pass") + (("self.system_fitsio_includedir = None") "pass") + (("self.system_fitsio_libdir = None") "pass") + (("self.use_system_fitsio") "True") + (("self.system_fitsio_includedir") includedir) + (("self.system_fitsio_libdir") libdir))) + ;; The bzip2 test fails because Guix' cfitsio + ;; is built without bzip2 support. + (substitute* "fitsio/test.py" + (("'SKIP_BZIP_TEST' in os.environ") "True")) + #t))))) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("cfitsio" ,cfitsio))) + (home-page "https://github.com/esheldon/fitsio") + (synopsis + "Python library to read from and write to FITS files") + (description + "A compact Python library for reading from and writing to FITS files, +based on the CFITSIO library.") + (license license:gpl2))) + (define-public qfits (package (name "qfits")