From patchwork Fri Feb 21 21:48:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 38927 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 541BC27BBEA; Fri, 21 Feb 2025 21:52:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,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 CDE7527BBE2 for ; Fri, 21 Feb 2025 21:52:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlawJ-00025h-Ms; Fri, 21 Feb 2025 16:52:07 -0500 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 1tlawI-000255-GH for guix-patches@gnu.org; Fri, 21 Feb 2025 16:52:06 -0500 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 1tlawI-0008Ng-7o for guix-patches@gnu.org; Fri, 21 Feb 2025 16:52:06 -0500 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=G+Jnz+EwmWsoX4Gu/3tcTlNBBz6PHQtSmcjMSknUOkI=; b=QIKu8hIQSm+mJsbcOtdgmGNgyc8FWkZvJfQ31jsEISGTeRb02AB3vZ62iI0U1kfMiTYfNw66Ss+GTLNJ60bu26wpxQoIU3ZmiS1hX7QZiPx9QO2yacVKC+GWLZBiNVZrisTl8DUbM1iCOzDNM3Iprevn86/2sZZd3Rph8oL4Pb8go1+hDZrcA6GJFEGx7TngAIFXxi1ME81qcRpDhloTk381Sohlwa0MmpxqfV3nnzAKbQlOn8JC71GlwX0JjQ/oINRWTEQ/4OeGO6yiljlmuXyOp1CC/o7860k05fOhfNavXwhoId2cA2+PthJRBOk0Tlh4SYeLG84ZkcGYk1M3KA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlawI-0004Wb-2W; Fri, 21 Feb 2025 16:52:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76480] [PATCH 04/51] gnu: libsep: Update to 1.4.0. 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: Fri, 21 Feb 2025 21:52:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76480 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76480@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 76480-submit@debbugs.gnu.org id=B76480.174017467716916 (code B ref 76480); Fri, 21 Feb 2025 21:52:06 +0000 Received: (at 76480) by debbugs.gnu.org; 21 Feb 2025 21:51:17 +0000 Received: from localhost ([127.0.0.1]:38519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlavU-0004Od-Qo for submit@debbugs.gnu.org; Fri, 21 Feb 2025 16:51:17 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:42475) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlauO-00044k-Cs for 76480@debbugs.gnu.org; Fri, 21 Feb 2025 16:50:10 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4399ee18a57so15764485e9.1 for <76480@debbugs.gnu.org>; Fri, 21 Feb 2025 13:50:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740174602; x=1740779402; 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=G+Jnz+EwmWsoX4Gu/3tcTlNBBz6PHQtSmcjMSknUOkI=; b=FpxARO04HMBEDBVpQafGj80ZTKi6gXSZ/zERTzw5yv3cqveprn/2a2jylG7Hnd7TI7 1CkenRG0lrvnvFNkP4/WY0PGkufikPergRG+kFArBZJm1BgPJNs7F/j3m58Z9BS6ep6+ WsUqkkO0r9rs1sVFZQEXbrQzUQnPrNd0bUd+PiqnbubMT1kuXwQtx7Z3zQfcPxSpUknm AQIH2SmBPDlNz1pYWf8y/UupuK9Y5wk00+dsXNdMYwgm5heR0skN5cI/R07AegA15G2a l8MW597+a6VmG0DW/ZXumkQnlWBRGK/JvQzVwxvGaudwh62d9/rfKXbpYrzoH9pcox6L dNeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740174602; x=1740779402; 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=G+Jnz+EwmWsoX4Gu/3tcTlNBBz6PHQtSmcjMSknUOkI=; b=LXAdh4qulgwIwXocZ870oaN0GM04WmBj3MyiywzrrDGgCFNycXapzit+yQPYvOD6ju 5tokG0VXILlGuJIpvKodmj+cLpya4TkP9qeE8NkWJifCLwqEWIBlqZCtvFiIKtRJ0gY7 G7+RbJCw2LPoFO+c8ozfp7LG+eLgd4EEEB9gX2rmh05Aokno95WHG9nlU+4vVOP/UM7Z tg9WG1Ndyz80YkFIdAwYmktNScWJyQm/0c3FpahhBqA27z8Ka7DSytBV96xrYpcgOB96 nJxN00A9zhvnTjdfz2efsln1aKLvIigMRdGxlCNP2J/skaxNSGK0/zP8RCjKpM+oIpGh q3dQ== X-Gm-Message-State: AOJu0YwUGYg2ZbrNLCIDKRZQw7lY7VPGh2LiD18lNO0uLqDtLymy7M66 7L+NEvXUJte8lJkvD2BiKdlIEsGxm+VEQueNHgTAOqKfOvu2aCkoszApAg== X-Gm-Gg: ASbGncuOx2mGvYB1dHx+u3YXDnG7a+B18k2XSLZVU4tujmgCQBwqnOgx7F0AuZGNvbV /VYXOsvMbadzWUVTdnVzY1cNpCVJpJAi3dAEs47KSTsHX6O0mUwawz7BrJdGPI/7sNaOeXrIqfo vdHwohhFPGvP2R7i5kXHMwowOuYsMVpx5XdBJ93zich1AHkARjcY5M8TxYXJ+GyIKCvS7KiYUbX hPHvct7ukzwPXuUSpheGq7huYe2FrZsnTDiErEH3pBIcS6Xa8nHn7dsh8MOZpzMOvxYpnmFT0mn 19LHusYEf3Y5PEtIu5Ijn+i8n+Emw7bxCZVcPptVDM26udEyJOaReGlmyCYfIoHb9dXLsXeIEbj QOk4zwYmEiciNMBuJzg== X-Google-Smtp-Source: AGHT+IGnxE74qJvzpAzuJpo4ATo79kQojm9MtMRjzEidnITYocTXg8OL+u2nW2F9moaENzoD4KrF3A== X-Received: by 2002:a05:600c:c8b:b0:439:7ef0:a112 with SMTP id 5b1f17b1804b1-439a30d4ef3mr76777105e9.10.1740174601994; Fri, 21 Feb 2025 13:50:01 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4399bea8577sm74601855e9.0.2025.02.21.13.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 13:50:01 -0800 (PST) From: Sharlatan Hellseher Date: Fri, 21 Feb 2025 21:48:58 +0000 Message-ID: <2a9351d59ca2d1f79016ad79b4b69fc82dc14cd0.1740173176.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.47.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 (libsep): Update to 1.4.0. [arguments] : Set to "test". : Add 'pre-check and use default 'check. (python-sep) [arguments] : Add 'set-version. [native-inputs]: Add python-setuptools-scm-next. Change-Id: I04ee0704fb52c1fb02d6efa0a2bc6b7e07a516de --- gnu/packages/astronomy.scm | 42 ++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e82a9274dfe..25826c22703 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1245,7 +1245,7 @@ (define-public libpasastro (define-public libsep (package (name "libsep") - (version "1.2.1") + (version "1.4.0") (source (origin (method git-fetch) @@ -1254,20 +1254,21 @@ (define-public libsep (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sag96am6r1ffh9860yq40js874362v3132ahlm6sq7padczkicf")))) + (base32 "03a9v3g8bq5sqq0ckxzkk63vij2y6ljpmymdvvvvb72q175pzpkd")))) (build-system cmake-build-system) (arguments (list - #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) - (string-append "PREFIX=" #$output)) - #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (chdir "../source") - (invoke "make" - (string-append "CC=" #$(cc-for-target)) - "test"))))))) + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (chdir "../source") + (setenv "CC" #$(cc-for-target)))))))) (native-inputs (list python-wrapper)) (home-page "https://github.com/kbarbary/sep") @@ -6137,11 +6138,22 @@ (define-public python-sep (name "python-sep") (build-system pyproject-build-system) (arguments - (list #:test-flags #~(list "test.py"))) + (list + #:test-flags #~(list "test.py") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" + #$(package-version this-package))))))) (native-inputs - (list python-cython python-pytest python-setuptools python-wheel)) + (list python-cython + python-pytest + python-setuptools + python-setuptools-scm-next + python-wheel)) (propagated-inputs - (list python-numpy)) + (list python-numpy)) (synopsis "Python library for Source Extraction and Photometry"))) (define-public python-sep-pjw