From patchwork Mon Apr 21 22:03:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 41885 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 DD93327BC4D; Mon, 21 Apr 2025 23:04:50 +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 541D927BC49 for ; Mon, 21 Apr 2025 23:04:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6zFP-0004mw-PC; Mon, 21 Apr 2025 18:04:15 -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 1u6zFN-0004l0-Mi for guix-patches@gnu.org; Mon, 21 Apr 2025 18:04:13 -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 1u6zFN-0004Jn-An for guix-patches@gnu.org; Mon, 21 Apr 2025 18:04:13 -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=pZcjKXnbkboGt18mSkGuVY1XT/cW/mvt1FOte0efMyI=; b=O01FGxoJFq6xAL3K5u2J7P11/KUK+gHeeb3UkBrtzZDCP5S4hHHgRppFv5WurN77pm5mNzXyNwgyUo5duzqVm0NQaM59dmIzfCY2XtwaRNR5gv4loInP4BYn7UU63rT2IpRiOpkS3QuawbEseLxyF4Bu9DW6uCsTGWD9c2Fjo6QpARgi44pRWbMf2D4dVi/GnM5TE4KP1OevznZ6S8jJ2XUj7B/HcOZ7Saxvt87sh91B2Mn0nerq87XT4Frd7H+7DG9arSL3dOzYNlgZIQgVUOJex489GmONBzeFFi/63Mtt0GFtgBNGA2nZHbEbUz3ac5TV7DlyhNtqfqCW65WfdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6zFJ-0002ch-Un; Mon, 21 Apr 2025 18:04:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77975] [PATCH 09/32] gnu: python-sunpy: Update to 6.1.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:09 +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.17452730439919 (code B ref 77975); Mon, 21 Apr 2025 22:04:09 +0000 Received: (at 77975) by debbugs.gnu.org; 21 Apr 2025 22:04:03 +0000 Received: from localhost ([127.0.0.1]:40168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6zFC-0002Zd-0w for submit@debbugs.gnu.org; Mon, 21 Apr 2025 18:04:02 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:45510) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6zF3-0002Wi-Ai for 77975@debbugs.gnu.org; Mon, 21 Apr 2025 18:03:54 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43ed8d32a95so38606525e9.3 for <77975@debbugs.gnu.org>; Mon, 21 Apr 2025 15:03:53 -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=pZcjKXnbkboGt18mSkGuVY1XT/cW/mvt1FOte0efMyI=; b=FO2SAo+os9x3u7NVbvK1vjq15pnp9vJBnv9+qtgT7aejOIwFwjF14mjoF9OPswaqxg v+bQ5DpYlqfHggmygU0xDJe6T+52B5GpJJyvB496ZaMLQBOsAs5r1r9oahwmT5/AKrYs AxJ4YDE085fbfmfUfsl9O+vaw8cGc9eFrlRf6yU+GsaCcEVtcF2NVYwXXd3GnUzcbm/H EcK+Ah60DunEG9uClL3y0HRPLWcUCQTfYEMEIF+h68nYBnH4DalZL/22+UNweJN6hQPT nsL6jOUpezBKeOp/slb4qmUsJWD3c+3jRMrRp7IW99EteWkYWOLrwd99gEOoOBoJFNFx 5QXQ== 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=pZcjKXnbkboGt18mSkGuVY1XT/cW/mvt1FOte0efMyI=; b=tHM2A6NSQ0wsePiI4SuzznUO2rpjya8XwUXmK93EvSzl6vF1bhNGOzgkpok3r0ZsaQ uUVURugIGxDThzif/udQgByzSMbN1skqU6epVlkPhWD3RThVkuVhOXoaL1+MogrRIx6a 0nOhuaqwj/KCacQ2abELHKAkXGbXn8lCrlEghAB94I4dSDGYpyHvwLLN8WtQBEmo6dPd 1zLPCcH+QTn4ICQYZyyVkw7In8ao9kUaY58NhI6NXjc6vAyyO0EJCpkBqJk77NJH0zBS ZXI+X3veErHFXjtXAsjSTSZ8BYFYoIumU2/SW5R+KcClp6NfIR747PDBckWQLw7Ksv/q e1+A== X-Gm-Message-State: AOJu0YyvSQmGQTAl6W11ZizzwAx5SpVp75nLRorEihPuLtIEFGFc9YEu 090UxXhvvvJFRN2I4U1a5fbd9EhKqFs4fKYT+xx5sWiAsOp3VeWXhQgx9kqs X-Gm-Gg: ASbGncvhCytl86xX8deAgwezwngWb2ZWykS/9iJI4wl5cqVutH+i2vE5GyqqwpH3CYP cxkNskFIf0J+vntJrlLCkitWKDSi3HQr9zs2MtEl09lwxMPi5kpA4RnLBtXC511NTMteaeueqSx X0y8MYj+dehPNcifaTEhyXhQ/iJSf2vRYOZvXbv6Ha4QCGniWzqEoziVfDK/0hmzreiBImgbX4K yJ5pHHM69JQCtuH3Ic+rv6B+gf6/4BU5m57vYa8xfe5v09SvKLN2hXz48hxTTfJqIl15ozY9/NM 5vXwdS8NVFTwxapWCQ4hrBvX0aI9sXbP0lbs2qfMQFnStkwJQ6fYV7t8MSRlI+yBpER2s8LTOfc uMppJDjzEBR0n39gid1AT6fdgB0BoESPQ5az+ZE4cutQzbOA= X-Google-Smtp-Source: AGHT+IEh54+UNzVMo6+Skt6+8FwOM0U0zYxzsYiGHKRt/jMEzHH+vAdLBtYaPfPYBpr4pR6IWR4KJg== X-Received: by 2002:a05:6000:2403:b0:39f:f4a:e852 with SMTP id ffacd0b85a97d-39f0f4ae886mr1645244f8f.55.1745273027244; Mon, 21 Apr 2025 15:03:47 -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:08 +0100 Message-ID: <3a6b097e15c17db878a343154a0e83c49f292454.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-sunpy): Update to 6.1.1. [arguments] : Limit parallel tests up to 8 threads to improve stability. : Remove 'relax-requirements, 'writable-compiler, 'prepare-test-environment; add 'remove-test-file; use custom 'check. [native-inputs]: Remove python-setuptools-scm; add python-setuptools-scm-next. Change-Id: I3fadca54c96d73e7ef54ebc513d4084eb5f9a615 --- gnu/packages/astronomy.scm | 41 ++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index f466b0a41f..8bb18b51b9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -7332,39 +7332,32 @@ (define-public python-sunkit-magex (define-public python-sunpy (package (name "python-sunpy") - (version "6.0.4") + (version "6.1.1") (source (origin (method url-fetch) (uri (pypi-uri "sunpy" version)) (sha256 - (base32 "1x659wal84m00czkjjkvkawxivgc5d43m71m3q817zmpjkin7bma")))) + (base32 "1nqk5q4gd7w59zsps8gyzh6r1mmpzia0z5494za6na5vn2qsc2f6")))) (build-system pyproject-build-system) (arguments (list #:test-flags - #~(list "--numprocesses" (number->string (parallel-job-count)) - ;; Requires SpicePy not packed in Guix yet. - "--ignore=sunpy/coordinates/tests/test_spice.py") + #~(list "--pyargs" "sunpy" + "--numprocesses" (number->string (min 8 (parallel-job-count)))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "pyproject.toml" - ;; packaging>=23.0 - ((">=23.0") ">=21.3") - ;; numpy>=1.23.5 - ((">=1.23.5") ">=1.23.2")))) - (add-before 'install 'writable-compiler + (add-after 'unpack 'remove-test-files (lambda _ - (make-file-writable "sunpy/_compiler.c"))) - (add-before 'check 'prepare-test-environment - (lambda _ - (setenv "HOME" "/tmp") - (call-with-output-file "pytest.ini" - (lambda (port) - (format port "[pytest] -python_files = test_*.py")))))))) + ;; Requires SpicePy wich is not packed in Guix yet and can't be + ;; ignored with Pytet options for some reason. + (delete-file "sunpy/coordinates/tests/test_spice.py"))) + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (with-directory-excursion "/tmp" + (apply invoke "pytest" "-vv" test-flags)))))))) (native-inputs (list opencv ; For tests, includes OpenCV-Python python-aiohttp @@ -7378,7 +7371,7 @@ (define-public python-sunpy python-pytest-mpl python-pytest-xdist python-setuptools - python-setuptools-scm + python-setuptools-scm-next python-wheel)) (propagated-inputs (list parfive @@ -7408,8 +7401,8 @@ (define-public python-sunpy (home-page "https://sunpy.org") (synopsis "Python library for Solar Physics") (description - "SunPy is package for solar physics and is meant to be a free alternative to the -SolarSoft data analysis environment.") + "SunPy is package for solar physics and is meant to be a free alternative +to the SolarSoft data analysis environment.") (license license:bsd-2))) (define-public python-tweakwcs