From patchwork Tue Jan 4 21:40:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 35952 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 172DD27BBEA; Tue, 4 Jan 2022 21:41:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 9CE3B27BBE9 for ; Tue, 4 Jan 2022 21:41:40 +0000 (GMT) Received: from localhost ([::1]:54732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4rYp-00078W-Qz for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 16:41:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4rYI-0006Wd-Fz for guix-patches@gnu.org; Tue, 04 Jan 2022 16:41:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4rYF-00025o-VI for guix-patches@gnu.org; Tue, 04 Jan 2022 16:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4rYF-00022d-Tn for guix-patches@gnu.org; Tue, 04 Jan 2022 16:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51765] References: In-Reply-To: Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 21:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51765@debbugs.gnu.org Received: via spool by 51765-submit@debbugs.gnu.org id=B51765.16413324587798 (code B ref 51765); Tue, 04 Jan 2022 21:41:03 +0000 Received: (at 51765) by debbugs.gnu.org; 4 Jan 2022 21:40:58 +0000 Received: from localhost ([127.0.0.1]:38921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4rYA-00021i-6v for submit@debbugs.gnu.org; Tue, 04 Jan 2022 16:40:58 -0500 Received: from mail-wr1-f52.google.com ([209.85.221.52]:37695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4rY8-00021U-Hi for 51765@debbugs.gnu.org; Tue, 04 Jan 2022 16:40:57 -0500 Received: by mail-wr1-f52.google.com with SMTP id t26so78787934wrb.4 for <51765@debbugs.gnu.org>; Tue, 04 Jan 2022 13:40:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=zrIdMYEsx6xES4ZIBtjxb0O1s79oaOsSt608+1ezP5c=; b=fVsrJ5GZ7DVMh/uKEgHizi6VKJtndwx2UAagJzhHgUbd5CfgJOoMx6W4qVttQsSKPI 7guSbEjUYbDicnmCfHrgRBTwSerXboqAyPWASVG93D4DDglgX0aVToYdQimni60cpLbA scprfeRiAx2KkNuttUqfQVzFOhR9vr0PQQCGN+BxTL4YEd5xPBjGN5jwqz88h+FKcG9H I+CYCGiUnDPM64XRXURfrLB9JnLUP7tUfNJlK/WcOi0M2S4dJl92iqpqlu+mV00so5++ XEHYNIUnitdLlmiXc3PkXkFuJWzYdB4dUGh5eX1A+A2EjN2NkD4aiOv54+jn1g+LO+f5 7lWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=zrIdMYEsx6xES4ZIBtjxb0O1s79oaOsSt608+1ezP5c=; b=t6bHpTMJDchAl+67BjOSH+rKJvD1lRPdDHUnGRMr55eNesDhtXYPIsDmh6IoYjAGF4 th2P87p1JAw5eoOR971M4eD9p2iegcf46zduyEcMWoVzbVDSUuwQiF2BRCBTvp7pzMKW aD6IJ0l90r1b799RfAZSZrgdU4CBKEZ3JdVFGEtNJPtnfVE7/Dp18CEC/b+a1811ZrMV IQ/RLHZsnTTlPbnKnKYzaPKLKXj9nuLB4BxTTgeswR8BDLGQ9meyL0pqtwoxvH6Bjl5W iK8zK/zAJpPqqkWUc8YgwZlBPXYGpKY+tA8nagoj42QK/AtyLouUFxZcE/XxjBOB0YJ7 lSlA== X-Gm-Message-State: AOAM531VeUGViTo8NHeXy72vduJQcxdlh6rYDOksZIpENcXuVSQcJ8Bd Ecq8WZEvwdXRaBNFlM5d7YVJXS4PFMnPoFLlDVl3xOcl X-Google-Smtp-Source: ABdhPJyGngJ+fQ/0GfzxOZ/0HOxbbSeqOaceiCPfNvZUxomwgNeLTBW0UVA9XDLCFb6SSSWHp/53+R3U9g4w98OqjeY= X-Received: by 2002:a5d:4a8e:: with SMTP id o14mr42789246wrq.441.1641332450932; Tue, 04 Jan 2022 13:40:50 -0800 (PST) MIME-Version: 1.0 From: Sharlatan Hellseher Date: Tue, 4 Jan 2022 21:40:40 +0000 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches -- … наш разум - превосходная объяснительная машина которая способна найти смысл почти в чем угодно, истолковать любой феномен, но совершенно не в состоянии принять мысль о непредсказуемости. From 6c7c70d12685dab78cc1687f003f3cdc18d359f4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 4 Jan 2022 21:21:31 +0000 Subject: [PATCH 5/5] gnu: gwcs: Refactor package * gnu/packages/astronomy.scm: (python-gwcs): Refactor package. [arguments]: Drop using gexp [inputs]->[propagated-inputs]: To allow using package as in input library. [lisense]: Add BSD-3 lisense --- gnu/packages/astronomy.scm | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5538f77f16..5c8bffdd57 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -66,7 +66,6 @@ (define-module (gnu packages astronomy) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (guix gexp) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -1470,15 +1469,13 @@ (define-public python-gwcs (base32 "194j49m8xjjzv9pp8cnj06igz8sdxb0nphyybcc7mhigw0f0kr30")))) (build-system python-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - ;; NOTE: (Sharlatan-20211229T163203+0000): Check if tests - ;; need to be run via tox - (invoke "python" "-m" "pytest" "--pyargs" "gwcs"))))))) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest"))))))) (native-inputs (list python-jsonschema python-jmespath @@ -1487,7 +1484,7 @@ (define-public python-gwcs python-pyyaml python-semantic-version python-setuptools-scm)) - (inputs + (propagated-inputs (list python-asdf python-asdf-astropy python-astropy @@ -1504,6 +1501,4 @@ (define-public python-gwcs between pixel and world coordinates. It supports a data model which includes the entire transformation pipeline from input coordinates (detector by default) to world coordinates. It is tightly integrated with Astropy.") - ;; NOTE: (Sharlatan-20211229T210517+0000): There is no reference to any - ;; license in source. - (license #f))) + (license license:bsd-3))) -- 2.34.0