all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 65814@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>,
	Andreas Enge <andreas@enge.fr>,
	Efraim Flashner <efraim@flashner.co.il>,
	Eric Bavier <bavier@posteo.net>
Subject: [bug#65814] [PATCH 10/19] gnu: python-fitsio: Update to 1.2.0.
Date: Thu,  7 Sep 2023 23:32:18 +0100	[thread overview]
Message-ID: <5b625501ebb664ccc33af696e823e92188f09cc3.1694125610.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1694125609.git.sharlatanus@gmail.com>

* 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")
-- 
2.41.0





  parent reply	other threads:[~2023-09-07 22:34 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-07 22:31 [bug#65814] [PATCH 00/19] gnu: Astronomy 2023/08 updates Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 01/19] gnu: libxisf: Update to 0.2.9 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 02/19] gnu: libxisf: Extend description Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 03/19] gnu: splash: Update to 3.8.4 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 04/19] gnu: python-astropy-healpix: Update to 1.0.0 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 05/19] gnu: python-cdflib: Update to 1.1.0 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 06/19] gnu: python-cdflib: Fix version detection Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 07/19] gnu: python-sunpy: Enable more tests Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 08/19] gnu: python-bayesicfitting: Update to 3.2.0 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 09/19] gnu: python-crds: Update to 11.17.4 Sharlatan Hellseher
2023-09-27 10:51   ` Christopher Baines
2023-09-07 22:32 ` Sharlatan Hellseher [this message]
2023-09-07 22:32 ` [bug#65814] [PATCH 11/19] gnu: python-jwst: Update to 1.11.4 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 12/19] gnu: python-photutils: Update to 1.9.0 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 13/19] gnu: python-pyvo: Update to 1.4.2 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 14/19] gnu: python-rad: Update to 0.17.1 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 15/19] gnu: python-roman-datamodels: " Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 16/19] gnu: python-roman-datamodels: Remove all test constrains Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 17/19] gnu: python-stdatamodels: Update to 1.8.0 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 18/19] gnu: python-astropy: Update to 5.3.3 Sharlatan Hellseher
2023-09-07 22:32 ` [bug#65814] [PATCH 19/19] gnu: python-tslearn: Update to 0.6.2 Sharlatan Hellseher
2023-09-18 18:20 ` [bug#65814] Sharlatan Hellseher
2023-09-27 11:42 ` [bug#65814] [PATCH 00/19] gnu: Astronomy 2023/08 updates Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5b625501ebb664ccc33af696e823e92188f09cc3.1694125610.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=65814@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    --cc=efraim@flashner.co.il \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.