unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 66778@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#66778] [PATCH 19/19] gnu: python-asdf: Update to 3.0.0.
Date: Fri, 27 Oct 2023 23:15:02 +0100	[thread overview]
Message-ID: <930123eed7ff4f683ed302de20c42a343f83a1ba.1698444193.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1698444193.git.sharlatanus@gmail.com>

* gnu/packages/astronomy.scm (python-asdf-3.0): New variable, migrated
from python-asdf.
[arguments]: Move it from here ...
[native-inputs]: Remove python-astronomy, python-pytest-openfiles.
[propagated-inputs]: Add python-attrs. Remove
python-importlib-resources, python-jsonschema.

(python-asdf-2.15): New variable. Inherited from python-asdf-3.0.
[arguments]: ... to here.

(python-asdf): Set it to use python-asdf-2.15 as 3.0.0 includes some
breaking changes which may not testes in dependent projects.
---
 gnu/packages/astronomy.scm | 48 ++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c5a6f59e87..ea69ad6542 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -3598,32 +3598,23 @@ (define-public python-tweakwcs
 @code{FITS WCS} and @code{JWST gWCS} are supported.")
     (license license:bsd-3)))
 
-(define-public python-asdf
+(define-public python-asdf-3.0
   (package
     (name "python-asdf")
-    (version "2.15.0")
+    (version "3.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "asdf" version))
        (sha256
-        (base32 "11s56797l5330kkhppkyz0bsvms016knmyswj4gx91zrxf8iqvv8"))))
+        (base32 "1a6lf75q9w8fsyq3hn6a7fyldkkyqxddlq21fwdfjwij40dzh3s8"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list #:test-flags
-           #~(list "-k" (string-append
-                         "not test_overwrite"
-                         " and not test_tagging_scalars"
-                         " and not test_info_command"
-                         " and not test_array_inline_threshold_recursive"))))
     (native-inputs
-     (list python-astropy
-           python-fsspec
+     (list python-fsspec
            python-packaging
            python-psutil
            python-pytest
            python-pytest-doctestplus
-           python-pytest-openfiles
            python-pytest-remotedata
            python-semantic-version
            python-setuptools-scm))
@@ -3631,10 +3622,9 @@ (define-public python-asdf
      (list python-asdf-standard
            python-asdf-transform-schemas
            python-asdf-unit-schemas
+           python-attrs ;; for vendorized jsonschema
            python-importlib-metadata
-           python-importlib-resources
            python-jmespath
-           python-jsonschema
            python-lz4
            python-numpy
            python-pyyaml))
@@ -3646,6 +3636,34 @@ (define-public python-asdf
 implementation of the ASDF Standard.")
     (license license:bsd-3)))
 
+(define-public python-asdf-2.15
+  (package
+    (inherit python-asdf-3.0)
+    (version "2.15.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "asdf" version))
+       (sha256
+        (base32 "11s56797l5330kkhppkyz0bsvms016knmyswj4gx91zrxf8iqvv8"))))
+    (arguments
+     (list #:test-flags
+           #~(list "-k" (string-append
+                         "not test_overwrite"
+                         " and not test_tagging_scalars"
+                         " and not test_info_command"
+                         " and not test_array_inline_threshold_recursive"))))
+    (native-inputs
+     (modify-inputs (package-native-inputs python-asdf-3.0)
+       (prepend python-astropy python-pytest-openfiles)))
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs python-asdf-3.0)
+       (prepend python-jsonschema python-importlib-resources)))))
+
+(define-public python-asdf
+  ;; Default version of ASDF..
+  python-asdf-2.15)
+
 (define-public python-asdf-standard
   (package
     (name "python-asdf-standard")
-- 
2.41.0





  parent reply	other threads:[~2023-10-27 19:17 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-27 22:08 [bug#66778] [PATCH 00/19] gnu: Astronomy 2023/10 updates Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 01/19] gnu: glnemo2: Fix home-page Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 02/19] gnu: imppg: Use standard configure phase Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 03/19] gnu: python-spherical-geometry: Simplify package Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 04/19] gnu: python-spherical-geometry: Enable tests Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 05/19] gnu: python-pynbody: Update to 1.4.1 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 06/19] gnu: python-cdflib: Update to 1.2.2 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 07/19] gnu: python-astroalign: Update to 2.5.0 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 08/19] gnu: erfa: Update to 2.0.1 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 09/19] gnu: python-pyerfa: Update to 2.0.1.1 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 10/19] gnu: libxisf: Update to 0.2.10 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 11/19] gnu: python-astropy: Update to 5.3.4 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 12/19] gnu: python-cdflib: Update to 1.2.3 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 13/19] gnu: python-crds: Update to 11.17.7 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 14/19] gnu: python-ephem: Update to 4.1.5 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 15/19] gnu: python-jwst: Update to 1.12.5 Sharlatan Hellseher
2023-10-27 22:14 ` [bug#66778] [PATCH 16/19] gnu: python-pytest-remotedata: Update to 0.4.1 Sharlatan Hellseher
2023-10-27 22:15 ` [bug#66778] [PATCH 17/19] gnu: python-pytest-doctestplus: Update to 1.0.0 Sharlatan Hellseher
2023-10-27 22:15 ` [bug#66778] [PATCH 18/19] gnu: python-pytest-astropy: Update to 0.11.0 Sharlatan Hellseher
2023-10-27 22:15 ` Sharlatan Hellseher [this message]
2023-11-05 18:29 ` bug#66778: [PATCH 00/19] gnu: Astronomy 2023/10 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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=930123eed7ff4f683ed302de20c42a343f83a1ba.1698444193.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=66778@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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).