From patchwork Mon Apr 21 22:03:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 41887 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 DB6E127BC4B; Mon, 21 Apr 2025 23:04:53 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 4F9DD27BC49 for ; Mon, 21 Apr 2025 23:04:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6zFM-0004je-S8; Mon, 21 Apr 2025 18:04:12 -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 1u6zFL-0004iL-0k for guix-patches@gnu.org; Mon, 21 Apr 2025 18:04:11 -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 1u6zFK-0004Is-Lx for guix-patches@gnu.org; Mon, 21 Apr 2025 18:04:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=btmBiQsRALPAp68foia9B8jfdLfTOqFk14Wx8iL5yJw=; b=CVpTap9hgJx5b8xtUDU6H8ZRJnLt+v1EiU3+AJS4Httoae6XZkI1SlxydTrms56bbOUK4daSzb5kHjpja3nkV2tkTxRsQDS38z0ewUmdhUpSGpHJ3/Ej02yHe6l0uEZGVq7LieMUGnNExI/tdSTC5ZK3LR5BNGx+0nErJLheSIIM9RgWbOY5xfwvoGwAVgmoVdPCXN3UiSneF6BjdS62v6xg9Q+xoeBJTGP6QPOz2xukEm+vjVBcXaUhM/CRykc+vXrHgQqzT5J4ksonjTjR6pUdlP2c7RqdzHn+k7ouP4CrDcql59QKIcE2cyTs4wt1fgQFDFWhXDQiyit7ahXaKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6zFI-0002cE-M0; Mon, 21 Apr 2025 18:04:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77975] [PATCH 08/32] gnu: python-astropy: Update to 7.0.1. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 22:04:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77975 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77975@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 77975-submit@debbugs.gnu.org id=B77975.17452730419883 (code B ref 77975); Mon, 21 Apr 2025 22:04:08 +0000 Received: (at 77975) by debbugs.gnu.org; 21 Apr 2025 22:04:01 +0000 Received: from localhost ([127.0.0.1]:40162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6zFA-0002Z1-B2 for submit@debbugs.gnu.org; Mon, 21 Apr 2025 18:04:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:47443) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6zF2-0002Wh-OX for 77975@debbugs.gnu.org; Mon, 21 Apr 2025 18:03:53 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso38996425e9.3 for <77975@debbugs.gnu.org>; Mon, 21 Apr 2025 15:03:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745273027; x=1745877827; 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=btmBiQsRALPAp68foia9B8jfdLfTOqFk14Wx8iL5yJw=; b=de6c1mu/7Vq3+RZYPb0tUqLmFRwimhGCb7414aMryQKGWPfevrPdGVViUUvLqZrJxn IbFy+dxn+tFLe6yMBtwJxf/gtB2HPfeUyekNMnftop8/5KAJ25lz6o6EuSySVh2hI9Y1 XcPBH7LZP0xoJ5QBPLOfxirSQYSbJk6zfCKUVM7hT9jILn9M56jFhzm2dUghlMQxvXF0 Y+j9mkdy1Br/HiLt8SSdR+Zw89pOBJV7u5TioAFhktFWc+2PvqinvYwhVVcJx8o67vRe Upau/3xS7mJDhkqO3jheSNSifI1UD1zUT19OlLwyPiTAvLxgOOZ1LNQAyTXWE9s3TXNw R9Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745273027; x=1745877827; 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=btmBiQsRALPAp68foia9B8jfdLfTOqFk14Wx8iL5yJw=; b=cCaI1Mp4VAfnC93Yt2R8nzpdyAW7HmRuH/dJkIOIOZIj6U0aP8s6/f5TmnY4n3ujhG OEf3gWzOQb8sgkcHwXO5uGZ81qP7ci4B9N3ZoX2GYZiVr2SwxRGnSDpA9Z4b05jNR1zb +6E53s8J+Bnrv1tQ8wDOEUI4JLBMs8joDoQIGtfecVja6AmvReem4z7KH7MxRQOWC8pq JdX1l59Kt2DvLUd6EBleKwelmMSS5Fz0UadDVB/oYl5zaIP3MFK6R4IPmVnZKDPtVa9e v4KFr/qxtwrGgkP8OpzqMF0qot3urLI9JjS10qLmR0ZP/LNQcmf+Y9w99UYNssuqfLI5 YA5A== X-Gm-Message-State: AOJu0YxTg7qKdp6Dns9OEYC2Xtm9sdN5DMumbGWAr41BrZ3dHe5g9ZT3 90cZzHuV8wQNiG4xdtBTYOm+OuK3DpDTddB+QS8CSWMSEhS+Ei/o69kaZiEq X-Gm-Gg: ASbGnctvgo4pVDO9lpKKitcvuKnqbnlYOy7XeaS0WhDn0eZxb5i9GvXlZeUjf7D8oUS qpsSyjzFjy/KEyJh+HXVso5VQb/Tofgx8darHtsED6zMONqYRYj8itaRPQQBVGd9MTZk2nZaJpB CcLBMaAFMc6HxUQ3TQQD8mOsB6HuvGngWsO2c+p+sQ1Pf/DwcZ4uritjz9kgEo/Q2M58EM+h0As rkC01ZqD5Vgt8dEi7sNmI9TE/VdgOO7vMul2TGdKawhCPBSLgFbgV7f02ibizV4wtL3ImbV/Kdp S8TvZTN9+o9f/EoyVgKV145B2akfsN/q8MYz1aYBt51DfVLyiSjEJSv4v01F4/ZPc49fwQfgdaj eowaAdzj7PceVjyP8b2Busqzb3uIExrVrS63j X-Google-Smtp-Source: AGHT+IGGByjNmA9mOZkImq52KLVYQ3AbcodpT7esFAROJk4fSUfdZ4hOkQmcQaEC8Skhiyp+tC2+BQ== X-Received: by 2002:a05:600c:5105:b0:440:6760:d06a with SMTP id 5b1f17b1804b1-4406ab7fdebmr100530385e9.5.1745273026537; Mon, 21 Apr 2025 15:03:46 -0700 (PDT) Received: from localhost.localdomain (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d5cf3a7sm149481855e9.32.2025.04.21.15.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 15:03:46 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 21 Apr 2025 23:03:07 +0100 Message-ID: <59264b2a66ff12a12dd8175b851aa0b6b702cac1.1745272461.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.49.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-astropy): Update to 7.0.1. [arguments] : Limit parallel tests up to 8 threads to improve stability; skip just one test. [phases]{check}: Set NumPy threads to 1. (python-astropy-6): New variable. (python-kanon) [propagated-inputs]: Remove python-astropy; add python-astropy-6. (python-poliastro): Likewise. Change-Id: Ice96b055331641d67d8043e20032ef7ff5cc1937 --- gnu/packages/astronomy.scm | 49 ++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e9d92c6ab7..f466b0a41f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2107,20 +2107,16 @@ (define-public python-astroml mining in astronomy.") (license license:bsd-2))) -;; XXX: Upgrading to the latest version requires Python3.11+ and fresh -;; versions of numpy, PyYAML, packaging, Pandas and matplotlib, see -;; . (define-public python-astropy (package (name "python-astropy") - (version "6.1.7") + (version "7.0.1") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "1vspagb4vbmkl6fm3mr78577dgdq992ggwkd5qawpdh6cccaq1d4")) + (base32 "0q74735xzrvxxpjv3sa8w68sfnziw1jilr70qba7qhxj8fsfwbrr")) (modules '((guix build utils))) (snippet '(begin @@ -2138,19 +2134,10 @@ (define-public python-astropy (list #:test-flags #~(list "--pyargs" "astropy" - "--numprocesses" (number->string (parallel-job-count)) - "-k" (string-join - ;; Skip tests that need remote data. - (list "not remote_data" - ;; ValueError: The truth value of an array with more than - ;; one element is ambiguous. Use a.any() or a.all() - "test_table_comp[t16-t26]" - ;; UnboundLocalError: local variable 'ihd' - ;; referenced before assignment - "test_delay_doc_updates" - ;; assert 13 == 1 - "test_skip_meta") - " and not ")) + ;; XXX: Tests are not thread save when they are more than 8. + "--numprocesses" (number->string (min 8 (parallel-job-count))) + ;; Fails with assert 13 == 1. + "-k" "not test_skip_meta") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'preparations @@ -2174,6 +2161,7 @@ (define-public python-astropy (lambda* (#:key tests? test-flags #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") + (setenv "OMP_NUM_THREADS" "1") ;; Step out of the source directory to avoid interference; we ;; want to run the installed code with extensions etc. (with-directory-excursion #$output @@ -2222,6 +2210,25 @@ (define-public python-astropy astronomy and astrophysics.") (license license:bsd-3))) +(define-public python-astropy-6 + (package + (inherit python-astropy) + (name "python-astropy") + (version "6.1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "astropy" version)) + (sha256 + (base32 "1vspagb4vbmkl6fm3mr78577dgdq992ggwkd5qawpdh6cccaq1d4")) + (modules '((guix build utils))) + (snippet + #~(begin + (with-directory-excursion "astropy/extern" + (for-each delete-file-recursively '("ply" "configobj"))) + (with-directory-excursion "cextern" + (for-each delete-file-recursively '("expat" "wcslib"))))))))) + (define-public python-astropy-iers-data (package (name "python-astropy-iers-data") @@ -4802,7 +4809,7 @@ (define-public python-kanon python-pytest-xdist python-requests-mock)) (propagated-inputs - (list python-astropy + (list python-astropy-6 python-matplotlib python-numpy python-pandas @@ -5071,7 +5078,7 @@ (define-public python-poliastro python-pytest-mpl python-pytest-mypy)) (propagated-inputs - (list python-astropy + (list python-astropy-6 python-astroquery python-czml3 python-jplephem