From patchwork Sun Oct 8 23:40:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 54624 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 436C227BBEE; Sun, 8 Oct 2023 21:43:19 +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=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 4CCBA27BBE9 for ; Sun, 8 Oct 2023 21:43:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpabB-0001u6-95; Sun, 08 Oct 2023 16:42:01 -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 1qpaax-0001ot-KT for guix-patches@gnu.org; Sun, 08 Oct 2023 16:41:47 -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 1qpaax-0005pi-Co for guix-patches@gnu.org; Sun, 08 Oct 2023 16:41:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpabH-0003C6-Hb; Sun, 08 Oct 2023 16:42:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66412] [PATCH 14/20] gnu: python-stcal: Update package style. 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: Sun, 08 Oct 2023 20:42:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66412@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 66412-submit@debbugs.gnu.org id=B66412.169679768312058 (code B ref 66412); Sun, 08 Oct 2023 20:42:07 +0000 Received: (at 66412) by debbugs.gnu.org; 8 Oct 2023 20:41:23 +0000 Received: from localhost ([127.0.0.1]:58657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpaaY-00038J-RK for submit@debbugs.gnu.org; Sun, 08 Oct 2023 16:41:23 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:47512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpaaQ-00035p-TI for 66412@debbugs.gnu.org; Sun, 08 Oct 2023 16:41:15 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40566f8a093so35674365e9.3 for <66412@debbugs.gnu.org>; Sun, 08 Oct 2023 13:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696797649; x=1697402449; 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=aufbjzMDio4UKI5T2YHPAqGFn9r0NyuDp7qJv4FnHQk=; b=nMBm5QqSvoGLFrfMPL6dJr5J1sUeHLGqVSZbD01E0eO1EG1x8I3VxUrieYbZxTjx8U kkKIep42q8wV/SMkhYUNpqXy6BprFmm7uBWQl0S62yeS+S+wH94nLZ0VgA2QOOFdx8L1 71pmfFpXWNZxZpxZPmYoc81hVYiBd9dFhWknDo0F75U9eJ1jYnZKW7iB5DUV8Rrjp4oC QHiIsO4B4eMNAoC4dG9f4ti/krCS2HN+mwvqfzSC3pyq8wGykXdl1PUVZ2XyLXUTM5O7 c5wvLO5NpuMljG2mh6vj4bX0QvEElTyH+qqXY2CO00dZNMlHAuAIiqcKQj9Q6JEmCb6v /otQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696797649; x=1697402449; 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=aufbjzMDio4UKI5T2YHPAqGFn9r0NyuDp7qJv4FnHQk=; b=hoPaU28Rp+zruZ4rzXMwJ14Up9lPh5/70twQ5yizYeJ5Jo31CXRfj3/FaMO+TAuDg9 YYFhgh5brKWo1Uz0HEbKleh8cGujFcxbrZm2uHWNqhWxrlzWFQCot4MsVl1fxDrcFYRm kMMpiqcnVJC1o3JaFbZiIrXmRoRuJuOhoR5PSqtneNdppphAbPI2zldz3SQZopX+C58E W3DZrcb/AzvhGfg3q/NoW3eHvH5ZHN62ZdhaBAUGYhUm9L9UgzyTa81L4kLbKKwTNL2P U1tzmXE+72ICt05RyaM0v12VrVKs9LIA/6lGHcREsZs51zDQuoZI2nwe/Hp1RkKemSJE kVlg== X-Gm-Message-State: AOJu0Yzg+r6WY2L8oLZT8OclXdUGdX86C1PrKomzOvlgV7g2h/XbvQTB q/zoQlGULQxlnzLx7/1x4KOCS+SZNq9lWw== X-Google-Smtp-Source: AGHT+IFvFvuSbQlT7ZNU6Z7dyxi1nZvu4YfUY5lLjbMvqbbJEgf6W1g9D8jOo6sFBnfAcYur0riwng== X-Received: by 2002:a05:600c:3586:b0:406:849c:52c3 with SMTP id p6-20020a05600c358600b00406849c52c3mr11298229wmq.22.1696797648939; Sun, 08 Oct 2023 13:40:48 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id a4-20020a05600c224400b003fe2b081661sm11608006wmm.30.2023.10.08.13.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 13:40:48 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 9 Oct 2023 00:40:16 +0100 Message-ID: <49014f240ab0dec63445f4a88d9c3df92c2eca7d.1696804840.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.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-stcal): Update indentation to improve readability of the package. --- gnu/packages/astronomy.scm | 53 +++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2a32b4e182..ee15394ed7 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2545,32 +2545,37 @@ (define-public python-stcal (package (name "python-stcal") (version "1.4.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "stcal" version)) - (sha256 - (base32 - "031ldihdmsdrwz4wl49bfk2bxmzbp1i3kidrw46xz936765zmnc0")))) + (source + (origin + (method url-fetch) + (uri (pypi-uri "stcal" version)) + (sha256 + (base32 "031ldihdmsdrwz4wl49bfk2bxmzbp1i3kidrw46xz936765zmnc0")))) (build-system pyproject-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - ;; XXX: Can't detect opencv-python version. The input - ;; opencv might not set the version correctly. - (delete 'sanity-check) - (add-before 'check 'build-extensions - (lambda _ - ;; Cython extensions have to be built before - ;; running the tests. - (invoke "python" "setup.py" "build_ext" "--inplace")))))) - (propagated-inputs (list opencv ;Provides OpenCV-Python - python-astropy python-numpy python-scipy)) - (native-inputs (list python-cython - python-psutil - python-pytest - python-pytest-cov - python-pytest-doctestplus - python-pytest-openfiles - python-setuptools-scm)) + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX: Can't detect opencv-python version. The input opencv might + ;; not set the version correctly. + (delete 'sanity-check) + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs + (list opencv ;Provides OpenCV-Python + python-astropy + python-numpy + python-scipy)) + (native-inputs + (list python-cython + python-psutil + python-pytest + python-pytest-cov + python-pytest-doctestplus + python-pytest-openfiles + python-setuptools-scm)) (home-page "https://github.com/spacetelescope/stcal") (synopsis "STScI tools and algorithms used in calibration pipelines") (description "STScI tools and algorithms used in calibration pipelines.")