all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 59978@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#59978] [PATCH 5/6] gnu: python-astropy: Update to 5.1.1.
Date: Sun, 11 Dec 2022 22:25:44 +0000	[thread overview]
Message-ID: <20221211222545.32318-5-sharlatanus@gmail.com> (raw)
In-Reply-To: <20221211222545.32318-1-sharlatanus@gmail.com>

* 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
-- 
2.38.1





  parent reply	other threads:[~2022-12-11 22:27 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-11 22:23 [bug#59978] [PATCH 0/6] gnu: python-astropy: Unbundle WCSLIB Sharlatan Hellseher
2022-12-11 22:25 ` [bug#59978] [PATCH 1/6] gnu: cfitsio: Update to 4.2.0 Sharlatan Hellseher
2022-12-11 22:25   ` [bug#59978] [PATCH 2/6] gnu: cfitsio: Build with bzip2 support Sharlatan Hellseher
2022-12-11 22:25   ` [bug#59978] [PATCH 3/6] gnu: python-fitsio: Update to 1.1.8 Sharlatan Hellseher
2022-12-11 22:25   ` [bug#59978] [PATCH 4/6] gnu: wcslib: Update to 7.12 Sharlatan Hellseher
2022-12-11 22:25   ` Sharlatan Hellseher [this message]
2022-12-11 22:25   ` [bug#59978] [PATCH 6/6] gnu: indi: Update to 1.9.9 Sharlatan Hellseher
2022-12-18 23:16 ` [bug#59978] Sharlatan Hellseher
2022-12-27 18:19   ` [bug#59978] Sharlatan Hellseher
2023-01-06 22:46 ` bug#59978: [PATCH 0/6] gnu: python-astropy: Unbundle WCSLIB Ludovic Courtès

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=20221211222545.32318-5-sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=59978@debbugs.gnu.org \
    /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.