From patchwork Wed Jun 21 06:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 51129 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 D563E27BBE9; Wed, 21 Jun 2023 07:37:56 +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,URIBL_BLOCKED autolearn=unavailable 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 3774427BBE2 for ; Wed, 21 Jun 2023 07:37:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBrRM-0001j6-KR; Wed, 21 Jun 2023 02:35:40 -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 1qBrR5-0001e7-LN for guix-patches@gnu.org; Wed, 21 Jun 2023 02:35:34 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBrQl-00066N-CD for guix-patches@gnu.org; Wed, 21 Jun 2023 02:35:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBrQk-0007is-Tt; Wed, 21 Jun 2023 02:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64201] [PATCH 02/20] gnu: python-photutils: Update to 1.8.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: Wed, 21 Jun 2023 06:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64201@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 64201-submit@debbugs.gnu.org id=B64201.168732925729437 (code B ref 64201); Wed, 21 Jun 2023 06:35:02 +0000 Received: (at 64201) by debbugs.gnu.org; 21 Jun 2023 06:34:17 +0000 Received: from localhost ([127.0.0.1]:60338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBrPy-0007eB-BF for submit@debbugs.gnu.org; Wed, 21 Jun 2023 02:34:17 -0400 Received: from mail-lf1-f52.google.com ([209.85.167.52]:51493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBrPt-0007dL-Au for 64201@debbugs.gnu.org; Wed, 21 Jun 2023 02:34:10 -0400 Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-4f865f0e16cso5500488e87.3 for <64201@debbugs.gnu.org>; Tue, 20 Jun 2023 23:34:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687329243; x=1689921243; 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=hD5KKYZqh05Jtcem2UdWj9zJCTJD6Eyb9vf6a6iUjSE=; b=DTmW+IBjRPz5St6WEFL2/mlI+o1mhzSw7c4NWcnq/wYt9HH1HTpJ9Vrw9I9yOmMlUH P2zhi01fW89fXazR4rwgshYRCm0RJg/pSMQ4u+EB2Vq5V663a9T1DrFB13M4IW4rE2f7 PQBVForXAvrmSKZ6Z1z1nd/9iSw9haMYWd0+fn5LWf7lwmbC6Xtes3yJHaShHcAyYUW/ eO4KYN5X1SgllIbIAOrTDUSTIxPgfG6/24+2kiDnveFyninf8hvUsyfSj1xEJ1wK+FC9 3tcn7ETQXu3BP3ixRGJo78JXJzUiq6XD15miDWohyV7eVb7GIqR4ilGd8Eyd/QfAUywz mt0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687329243; x=1689921243; 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=hD5KKYZqh05Jtcem2UdWj9zJCTJD6Eyb9vf6a6iUjSE=; b=S4IMiT1WOfY9QmAJMvRmWPuzuKGgk3orO+m4GwcI8NpCLtB2FjZYh/qV2SYZxqxkNo rL5kIm+7J5LuISdnT/k+yk4ztqhIenLqKNdnux+3d8cSAl3AlaXRx9KHKEJxsBc43zA9 ePwutq30ujalUvUWr62+KRK1TkstfU68K5NBd46gkcIjhEjdx1BYGwzlZh2QpEsn/F9i cntsSl5pi2emTCQwxpf599OOUyI1ccDKZivnSSpFwpNNj3Bk64L7YUw8D8uLWdGJrAz3 MXjDarvNOakXv0vJdYl4vGXH8IoyAbdFjzo4vukeOTrzy68FK2KaBcuApGv8HMFLVXv6 1klA== X-Gm-Message-State: AC+VfDwUG6HAd17jVADC48h45H5A+o12V8htFBGOF7L2Sdodqad1Euxz zo21Hl3Kc8gMpSn48k2dzkz+/mbYAbs= X-Google-Smtp-Source: ACHHUZ5WjkniF4fCyr/wxYQaYpHcdtct2vKZHWUgQcH+B7VDEsSr2Uw3+4jKYP5ghpDNOVD2W2Jx0g== X-Received: by 2002:ac2:464b:0:b0:4f9:127e:55fe with SMTP id s11-20020ac2464b000000b004f9127e55femr2721765lfo.17.1687329243045; Tue, 20 Jun 2023 23:34:03 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r15-20020a5d52cf000000b0030af72bca98sm3553471wrv.103.2023.06.20.23.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 23:34:02 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 21 Jun 2023 07:33:41 +0100 Message-Id: <2996094fec269e9b9272c8f51aac1943e7333b9e.1687302523.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 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): Update to 1.8.0. Activate more options. [build-system]: Swap to python-build-system. [arguments]: Use G-expressions. Rename the phase before check 'writable-compiler to 'build-extensions to reflect it's purpose, add new step in phase building extensions for testing. [propagated-inputs]: Add python-bottleneck, python-gwcs, python-matplotlib, python-scikit-image, python-scikit-learn, python-scipy, python-shapely, python-tqdm [native-inputs]: Remove python-pytest-runner. Add python-semantic-version. --- gnu/packages/astronomy.scm | 44 +++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 787ca01491..16debb93a0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -55,6 +55,7 @@ (define-module (gnu packages astronomy) #:use-module (gnu packages libevent) #:use-module (gnu packages libusb) #:use-module (gnu packages lua) + #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) @@ -1701,30 +1702,47 @@ (define-public python-mpl-animators (define-public python-photutils (package (name "python-photutils") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (pypi-uri "photutils" version)) (sha256 - (base32 "1bq4ma402lpa5d6l85awlc23kasxf40nq8hgi3iyrilnfikan0jz")))) - (build-system python-build-system) + (base32 "07khld3la1zwxd36kal6rglgkji4sd65lk4jc3khk0glb5v3kkrc")))) + (build-system pyproject-build-system) (arguments - `(#:test-target "pytest" - #:phases - (modify-phases %standard-phases - ;; 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 'writable-compiler - (lambda _ (make-file-writable "photutils/_compiler.c")))))) + (list + #:phases + #~(modify-phases %standard-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")))))) (propagated-inputs - (list python-astropy python-numpy)) + (list python-astropy + python-bottleneck + python-gwcs + python-matplotlib + python-numpy + ; python-resterio : Not packed yet + python-scikit-image + python-scikit-learn + python-scipy + python-shapely + python-tqdm)) (native-inputs (list python-cython python-extension-helpers python-pytest-astropy - python-pytest-runner + python-semantic-version python-setuptools-scm)) (home-page "https://github.com/astropy/photutils") (synopsis "Source detection and photometry")