From patchwork Fri Oct 27 22:15:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55453 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 6E4E827BBEA; Fri, 27 Oct 2023 20:17:43 +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 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 8A18A27BBE2 for ; Fri, 27 Oct 2023 20:17:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwSK3-0000Fe-RS; Fri, 27 Oct 2023 15:16:43 -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 1qwSJx-0000Be-G9 for guix-patches@gnu.org; Fri, 27 Oct 2023 15:16:38 -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 1qwSJw-0001xB-L9 for guix-patches@gnu.org; Fri, 27 Oct 2023 15:16:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwSKR-0001nx-7Z; Fri, 27 Oct 2023 15:17:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66778] [PATCH 19/19] gnu: python-asdf: Update to 3.0.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: Fri, 27 Oct 2023 19:17:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66778 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66778@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 66778-submit@debbugs.gnu.org id=B66778.16984342036770 (code B ref 66778); Fri, 27 Oct 2023 19:17:07 +0000 Received: (at 66778) by debbugs.gnu.org; 27 Oct 2023 19:16:43 +0000 Received: from localhost ([127.0.0.1]:37310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwSK2-0001l3-Hu for submit@debbugs.gnu.org; Fri, 27 Oct 2023 15:16:42 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:42393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwSJU-0001hO-5j for 66778@debbugs.gnu.org; Fri, 27 Oct 2023 15:16:08 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40806e4106dso14513435e9.1 for <66778@debbugs.gnu.org>; Fri, 27 Oct 2023 12:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698434131; x=1699038931; 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=ilx5J1HgYx8d8fQhGcUgikh7o6QVvqRJ+edjAxgPlt8=; b=WGoyjU79suYnET5u9isz7lvVGibviskq6Q1aDJl7exx/atgqwq4BTaV1ebmzxddSxO NIZZQy9usQQiTyrF01P73N8o3KtLzYzJy+/Ik5Yt7QEqUecH1m93Ikc+5a7hoijipUaj bYWok0qjWzg7ey7X5b/eYvIhwCdWTD5bvwCX7uZLI+AEcyl7GwZa+hKRbfnOhpv3zw9l Ws++LR6FHvOLmwLozprl0bBLp1EFLY0YnP/wyIcmtv5vo42rym+1ZmQqR5al0nOzrB9A JYMB4FvawJ6BY8musqz1Pci4NDE0Pxab35hLnpUIh2U8bnuGTnWM6mP/i2M2AZRJSV+L ZiPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698434131; x=1699038931; 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=ilx5J1HgYx8d8fQhGcUgikh7o6QVvqRJ+edjAxgPlt8=; b=evQX8HsrCM+E93BL/dCQKg7kSAQ0JUG1b6xk37IlDFUDnYvjZh12ovZgczWZFQDYQ3 0MRN6FVJdVP8dgXFqt++D+7Odq7bPdAqqcGjfqWLej39EtoF0/i+XRkRU4fipDDOtkLh 4/Ha6CCLIoL29Q8Vhw4niYb8192EPIEB8XeUz02t4v6c+wEPjTsph6Oc1wbei38SUCQp jmBd6tKxmwYjzTi5HZHlqtG9QoEKgx0uZqipH1VmqvNBXGoAvITP+OSQsY1mcUGpxZnw X4wBI8rIQItxlEoD/RsLBbqpUxgPdHqRXzUjpdRQGIc+FKsCg7BxF44fbSrXdB3euVQo OxRQ== X-Gm-Message-State: AOJu0Yy+a8AZ7f4cwhRuiacXC1fJGKPJxg3eyhPi3fKBxnm6xXXijkNG etrUDcehK6LoM0ZPFEEI3J3gLMFW69c9Yw== X-Google-Smtp-Source: AGHT+IHFtGh8LA4yvFjs0ZaL62tq+wK7DnlWXMzcvKH0dWojv32SE5ZA6N7RbCwkbdgWlXdo5yUh0g== X-Received: by 2002:a05:600c:4f92:b0:407:3e94:bcca with SMTP id n18-20020a05600c4f9200b004073e94bccamr4293436wmq.1.1698434130912; Fri, 27 Oct 2023 12:15:30 -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 bg38-20020a05600c3ca600b003fee8793911sm2275764wmb.44.2023.10.27.12.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 12:15:30 -0700 (PDT) From: Sharlatan Hellseher Date: Fri, 27 Oct 2023 23:15:02 +0100 Message-ID: <930123eed7ff4f683ed302de20c42a343f83a1ba.1698444193.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-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")