From patchwork Mon Apr 21 22:03:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 41884 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 D742B27BC4A; Mon, 21 Apr 2025 23:04:45 +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 363C827BC4B for ; Mon, 21 Apr 2025 23:04:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6zFN-0004kj-HA; Mon, 21 Apr 2025 18:04:13 -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-0004ix-MG 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 1u6zFL-0004J4-Ce for guix-patches@gnu.org; Mon, 21 Apr 2025 18:04:11 -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=GOw/JSTQGvwIGo4YB4qvOHpyEmd/VAhzZ2AZYbxK5mM=; b=oesvVf9yQeyBDKwdn+l1zazmOR98otmKEnw9Bq4clzHyW9cswVD73NVlrZafcvbdiK/t8GBD06FI98JbDvbyGUt/coplqQub3pm9DY56IZtVrHszEOdoGNmouDOeWuVUspLHdqPvXJ0tj6rXZPkgg6y1dmEzv6GGAver1JeNSIGq21gEDlfT1y/cbFjIysypLOFeebPpsxbO+DcPfpOMikJFMjh4NRPhsWE+xqs63eiCqQ8niylui0GaD2dS/PTKSP2lDVrMgnU7DVsbFOvdW/j+1N115jtPAgzFmosXnNOwHOXdf2iagW12aatOAMgzCTEmMbbz5imk1lw+h0PsAw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6zFL-0002d8-6d; Mon, 21 Apr 2025 18:04:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77975] [PATCH 10/32] gnu: python-photutils: Simplify. 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:11 +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.17452730449959 (code B ref 77975); Mon, 21 Apr 2025 22:04:11 +0000 Received: (at 77975) by debbugs.gnu.org; 21 Apr 2025 22:04:04 +0000 Received: from localhost ([127.0.0.1]:40174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6zFD-0002aE-RN for submit@debbugs.gnu.org; Mon, 21 Apr 2025 18:04:04 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:50278) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6zF4-0002Wp-9N for 77975@debbugs.gnu.org; Mon, 21 Apr 2025 18:03:55 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43690d4605dso36015335e9.0 for <77975@debbugs.gnu.org>; Mon, 21 Apr 2025 15:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745273028; x=1745877828; 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=GOw/JSTQGvwIGo4YB4qvOHpyEmd/VAhzZ2AZYbxK5mM=; b=I8WVaaWwfWoWuengfBbBdjgqbtWdEe7O67ZcpTMDYzJ/hdLgjZ6rYRA6LRac7m/Int r/RdpOecw2ThcUuX0ZLdhJnbryr/qF1WpnXGLWnB5UnD2yJge+cC5ZUAIhSYE/2aE70J NeFW+7ThC6zEKeSDtajMi2UOmXqlIoc2LZ7QNtsWN2nW8vItoNo4I7QYqOisgWPyRh8r Wv9y/slEMongJAi+aeol2kCoe9SGyuLFzlRxr5bobf5aiojfe+Z5TWFN7st2yxpotpt0 6WsthyRdX6+Ng8TdwXCV/Ac6D3KwLUwOoZRGaUSOrplktzMMtfZl539DNM869YbINo2L Lztg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745273028; x=1745877828; 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=GOw/JSTQGvwIGo4YB4qvOHpyEmd/VAhzZ2AZYbxK5mM=; b=HDD22Osg9ZHSO9xJVo2ZDz3YcooJde/qFW7bbPJMxlRaMdMzH+P1+sui0bmDYReIg8 gkc6ck/pU1nBv64pbJu7m2q+xKTayYH4TNf/WkNm4cS+XLzutsUn2CqQZLFmQfWJ5Ugk XTyhc2DKpfH2pHlmBRppSNa3bSmYuBCt30KcIHPW+j8w+uIpUBDouKnSotFo3/qgBhFq Mr/qvZV0iYe3Q8i+ZNzu7quJVUBSMJQeG/jAfD5u4JIIe1AlVhqTsTaL2wdDtIaV5Bku t9AQxxEM4lBR3EXmQQFbmqdrhCjXH1c83mwEMu11zIW0GkP72O5FKBq5SrGZopHyicF0 VlpQ== X-Gm-Message-State: AOJu0YznBkk4S8rU8MQpZj3W8bbMHJSFYGxJxw4/G4Jv3bqwDEDDzuWF QmbXo4Yrh4RDCpVCYFSiW3S5ddnnZJOBt6EDxzSHqqG165m0tUrZaAaovkEp X-Gm-Gg: ASbGncte9gjy/bpDcmemwor5o2orzBwHkMbk96EOM2H9poBvojVuUn3H3j00Tml1nYU lwnmMX6w5SPBvg/bt8LwxEFLIl7SH50/ollf/3K1yoHJtb76e+GmC/pKaD1srjVUkIpI2AAvqlO oc17dbqhi7YtfNEkIJ9WEWhfcu0e8Gr8740eaSxi1TrETNkrUHCkCwtd4FGtHRdxMIPFFVeyUvr vnUlQNBPZGErd+821fB/sGRNwogFvRSunZOet9Zngua5k87XHVPPzgIuCOAQI3qyEt7YUsI9OgV GyNsVree7tCrSVGQua5mf89Zj/6rZ010Ap29b0421q6q+pZ9FS/5Ad7hqoRIP3MMfZCqW7/9xZs CklqQDCyvn/5SBIORMLx/q10uprE/gmFbf4XL X-Google-Smtp-Source: AGHT+IE8N0USAyZ4pYXO/wetxXlMbdtLpkAxsacKx7B4OX4VpMUXz3tz2bh5eRgUhgcEB2sp9uQ9bw== X-Received: by 2002:a05:600c:1913:b0:43c:f597:d584 with SMTP id 5b1f17b1804b1-4406ac2725bmr107986605e9.29.1745273028203; Mon, 21 Apr 2025 15:03:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 15:03:47 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 21 Apr 2025 23:03:09 +0100 Message-ID: <64d9924340e59cafcbcbaf88fb6af7a470847667.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-photutils) [arguments] : Limit parallel tests up to 8 threads to improve stability. : Remove 'relax-requirements, create-setup.py, 'writable-compiler, and 'build-extensions; use custom 'check. Change-Id: I82f6f792a3f88836f6b2d39b2f1ce4db2d41acea --- gnu/packages/astronomy.scm | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 8bb18b51b9..67d406fa43 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -4959,36 +4959,15 @@ (define-public python-photutils (arguments (list #:test-flags - #~(list "--numprocesses" (number->string (parallel-job-count))) + #~(list "--pyargs" "photutils" + "--numprocesses" (number->string (min 8 (parallel-job-count)))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "pyproject.toml" - ;; numpy>=1.24 - ((">=1.24") ">=1.23")))) - ;; setup.py was removed in 36c3231ce5b80ad470fa78be2e96df859d2daf41 - ;; for some unknown reason, which caused the package to fail to - ;; build. It is being recreated based on that commit. - (add-after 'unpack 'create-setup.py - (lambda _ - (call-with-output-file "setup.py" - (lambda (port) - (format port "from setuptools import setup -from extension_helpers import get_extensions -setup(ext_modules=get_extensions())"))))) - ;; This file is opened in both install and check phases. - (add-before 'install 'writable-compiler - (lambda _ (make-file-writable "photutils/_compiler.c"))) - (add-before 'check 'build-extensions - (lambda _ - ;; Cython extensions have to be built before running - ;; the tests. If it's not build it fails with error: - ;; - ;; ModuleNotFoundError: No module named - ;; 'photutils.geometry.circular_overlap' - (make-file-writable "photutils/_compiler.c") - (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + (with-directory-excursion "/tmp" + (apply invoke "pytest" "-vv" test-flags)))))))) (propagated-inputs (list python-astropy python-bottleneck