From patchwork Thu Sep 7 22:32:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 53665 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 672AD27BBEA; Thu, 7 Sep 2023 23:34:08 +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,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 5327827BBE2 for ; Thu, 7 Sep 2023 23:34:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeNYi-0006RO-Du; Thu, 07 Sep 2023 18:33:08 -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 1qeNYg-0006Pb-Kt for guix-patches@gnu.org; Thu, 07 Sep 2023 18:33:06 -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 1qeNYg-0001Pc-Az for guix-patches@gnu.org; Thu, 07 Sep 2023 18:33:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeNYf-0007Jv-R2; Thu, 07 Sep 2023 18:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65814] [PATCH 10/19] gnu: python-fitsio: Update to 1.2.0. 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: Thu, 07 Sep 2023 22:33:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65814@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 65814-submit@debbugs.gnu.org id=B65814.169412597727976 (code B ref 65814); Thu, 07 Sep 2023 22:33:05 +0000 Received: (at 65814) by debbugs.gnu.org; 7 Sep 2023 22:32:57 +0000 Received: from localhost ([127.0.0.1]:41588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeNYW-0007H3-9K for submit@debbugs.gnu.org; Thu, 07 Sep 2023 18:32:56 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:61631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeNYM-0007E5-Jr for 65814@debbugs.gnu.org; Thu, 07 Sep 2023 18:32:47 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-31adc5c899fso1498179f8f.2 for <65814@debbugs.gnu.org>; Thu, 07 Sep 2023 15:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694125959; x=1694730759; darn=debbugs.gnu.org; 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=gKu64m+vwnvKze+y+CI9qMMvESmRu+rrY3oX8kENnLk=; b=Kwf/3MYUFTbL76IhbaipuT+oxbrz1Zd1v50uKoyuxeX5k7kooO6ISRJQs9qwkWIB73 IzuqhqLw7Mfbvfw4lAGw/WHoNbrfbphQV6UaTx9fzdPI5qXY5yMGZTj9j7yUgMzSTBgO wIbXfsaNZhcHT/1mTcMHUlpl4ADynqEY5Rx2lP5qq2dQzb93fAQTlWino4BLXmHcVk6u jgUlDgUUkrF7RXpPqzp4uA4H2dCuIG2HvydX7B+9hMwCYM1sxdjrjQD/l/f+ayiodQl0 dysu6/1WIY1R/1qgUTsZhGOSNJpuYdnsPkMcQqf+nSZrER2KRRHXIbwUZ/m4z98WsQZt Z9ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694125959; x=1694730759; 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=gKu64m+vwnvKze+y+CI9qMMvESmRu+rrY3oX8kENnLk=; b=oyg8CDcwhebzcdwaV1+zIu55vVgsuXf4R7cGf5nZQEgFoNB9M+v4k67xIotzvda88B hADd19bFHefbJDcKo+zsi1bxmjE60JEf1fyrWxbJVBatWsrYRfcHf4b5XELUDozkbAyU QStwBK5GWI6Uwu5g0aGBvdDbDn6V2g6BvV4D7huDj7w6WNVf5tFcFoXwliu+MuH6vCiK sUR/juDQoaoEIf+irv+Z/F5wiOoFJqxUWXYoiboafHs94MAyvHSnWQXhEi/59GeA5h3L t2y1MNd1ODkeu9YN6X0P8aFRoQjSBIc+/gYqRAsndkw1Vd5Qra8lQc9zFvOcG/Ai5V3q E1iQ== X-Gm-Message-State: AOJu0YzZZSpiytOtG/j8Z7E4weyvsujPvajg73xfCXvjEmzsJzuD31ed x6lUJMc9VDSqAy6+bDGmUnRjnimwayJHjQ== X-Google-Smtp-Source: AGHT+IEBGDpDUz0iJEatA6AXguTR7IiKLKiYNwqaXuBG1bRFJ15YEB7F1Wpq4NK/BD+IedsNgt2zLw== X-Received: by 2002:a05:6000:1250:b0:31d:74f8:fae with SMTP id j16-20020a056000125000b0031d74f80faemr433065wrx.71.1694125958921; Thu, 07 Sep 2023 15:32:38 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id d10-20020a056000114a00b0031ddf6cc89csm443463wrx.98.2023.09.07.15.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 15:32:38 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 7 Sep 2023 23:32:18 +0100 Message-ID: <5b625501ebb664ccc33af696e823e92188f09cc3.1694125610.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 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-fitsio): Update to 1.2.0. [arguments]{phases}: Swap 'unbundle-cfitsio to 'set-env as there is support for system CFitsio library provided. [inputs]: Add zlib. --- gnu/packages/astronomy.scm | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index cf524a2f6c..2064a05c64 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -534,45 +534,42 @@ (define-public python-astroml (define-public python-fitsio (package (name "python-fitsio") - (version "1.1.10") + (version "1.2.0") (source (origin (method url-fetch) (uri (pypi-uri "fitsio" version)) (sha256 - (base32 "0dv2vjj8qn3rq5sr99x5yjjch5h867c8q7zh73i67dzdsk7ix0jf")) + (base32 "04fbg1ffj7qrlzw50xzzkfnlk6qjjqq96j0im7phprmwb1rbvzzh")) (modules '((guix build utils))) (snippet - ;; Remove the bundled cfitsio + ;; Remove the bundled cfitsio. When update the package check the + ;; current bundled version. #~(begin - (delete-file-recursively "cfitsio3490") + (delete-file-recursively "cfitsio-4.2.0") (substitute* "MANIFEST.in" - (("recursive-include cfitsio3490.*$\n") "")))))) + (("recursive-include cfitsio-4.2.0.*$\n") "")))))) (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'unbundle-cfitsio + (add-before 'build 'set-env (lambda _ - (let* ((cfitsio #$(this-package-input "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))))) + (setenv "FITSIO_USE_SYSTEM_FITSIO" "True") + (setenv "FITSIO_SYSTEM_FITSIO_INCLUDEDIR" + (string-append + #$(this-package-input "cfitsio") "/include")) + (setenv "FITSIO_SYSTEM_FITSIO_LIBDIR" + (string-append + #$(this-package-input "cfitsio") "/lib")))) (add-before 'check 'build-extensions (lambda _ (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list python-pytest)) (inputs - (list curl cfitsio)) + (list curl cfitsio zlib)) (propagated-inputs (list python-numpy)) (home-page "https://github.com/esheldon/fitsio")