From patchwork Sat Jul 20 22:40:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 66395 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 06D1127BBE9; Sat, 20 Jul 2024 23:43:43 +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 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 8CE4F27BBE2 for ; Sat, 20 Jul 2024 23:43:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sVInM-0004b3-HV; Sat, 20 Jul 2024 18:43:16 -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 1sVInH-0004Vq-ID for guix-patches@gnu.org; Sat, 20 Jul 2024 18:43: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 1sVInF-0004Ld-KG for guix-patches@gnu.org; Sat, 20 Jul 2024 18:43:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sVInG-0001mM-C0; Sat, 20 Jul 2024 18:43:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72219] [PATCH 20/34] gnu: python-stpipe: Improve indentation. 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: Sat, 20 Jul 2024 22:43:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72219@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 72219-submit@debbugs.gnu.org id=B72219.17215153676529 (code B ref 72219); Sat, 20 Jul 2024 22:43:10 +0000 Received: (at 72219) by debbugs.gnu.org; 20 Jul 2024 22:42:47 +0000 Received: from localhost ([127.0.0.1]:54096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVIms-0001h8-UG for submit@debbugs.gnu.org; Sat, 20 Jul 2024 18:42:47 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:53597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sVImV-0001dR-NG for 72219@debbugs.gnu.org; Sat, 20 Jul 2024 18:42:24 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4267300145eso24639905e9.3 for <72219@debbugs.gnu.org>; Sat, 20 Jul 2024 15:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721515282; x=1722120082; 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=rZzUE7nqUw72mBUsOa6YqA10+2MzUbIU6YxCMaxEYpQ=; b=G0YZdKxg2J73XZVh0RD8QpHXSedpgxBPzIF9VHOmHR9EMWRrDXlRPy+Szi0XG9ilUJ PVLwyq+L9zvHQW5Svrj1hBVxt3U7hZSz0B+DQEkXvD5cd3M9zwQ4VmdWCuFWc6ezkPM/ RQAu0eVPW+weY6sYZ9cNP/suyWB9LrA7qHkvxrA1Zhhm+mi2gNU4J4+DahliBC/F3/dP zly43P0sC6WzMha8PUPEZjfY093QGS4PzqrWuBiLChhkSw31l13unT9CjJ4e/8PQUUfc E6HqY3ZKkRucM4qyjEhqfKNKBmkeEffmZXMbFfYjRQjHre+Zj9tMaYCg/MN8Xf14R0cX dztg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721515282; x=1722120082; 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=rZzUE7nqUw72mBUsOa6YqA10+2MzUbIU6YxCMaxEYpQ=; b=UTBesMr/UcZ6RYIc1/DUrFKbV+InUs2IlLSaRckVPFrA9o3DK/Uy2BbWetks+CkDyz PmQ1zlbLgtWkPEPqcC3TbXSV3fcvqeFaZmAzFsEoBMjOlPFWSZqOE7/2vrhAGBo7m4Gt quRCIIzO/Nr6zIHt33Mu6xQQ5C5/x3uJDS9AbPdUwSNKMyQBWE8f3Zgsk3kwUoOp59hW eeBrugSWwtZxcwx47pLFVtD14etsaM7LNZvzOntlTMB4iU9GwBnyVh0Q6R4JASLL06iE pI9M3qbYXOy7LhBCq1IyI3aTQYtMX2Lav2llF+EW5hQyfor2Zyk0Hq6FjsvUdWLlQaE7 L3wQ== X-Gm-Message-State: AOJu0YyGsjXhF1LBtzap/fo4lncIsa6yEIQZ1dRuzOm7TcXRNGtEF0E4 RSQMbt6lfYd50O+QUWGwqbSSeanqHYbBimCO6Evq9v3RlpaGtge2aaDjftA0 X-Google-Smtp-Source: AGHT+IGgQRG3HBgps4QTiH9masiWHE62zPo5trk9DIhLmg6X4YwxP744emtDgFHyVWKZvF6EfwqKog== X-Received: by 2002:a05:600c:3582:b0:426:6bf9:608d with SMTP id 5b1f17b1804b1-427dc52050dmr16269965e9.12.1721515281863; Sat, 20 Jul 2024 15:41:21 -0700 (PDT) Received: from guxtil.incerto.xyz (bagu-15-b2-v4wan-170076-cust245.vm21.cable.virginm.net. [77.98.0.246]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-368787cec6bsm4690294f8f.71.2024.07.20.15.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jul 2024 15:41:21 -0700 (PDT) From: Sharlatan Hellseher Date: Sat, 20 Jul 2024 23:40:43 +0100 Message-ID: <0c4945e765f8d1b70eb4f098987744c0ff8ec26d.1721514686.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-stpipe): Improve indentation. Change-Id: I0889f1374aa0024c34eaf9a670c3d8beda40011a --- gnu/packages/astronomy.scm | 42 ++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b5eb1527d0..e3494c9b07 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3523,30 +3523,36 @@ (define-public python-stpipe (package (name "python-stpipe") (version "0.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "stpipe" version)) - (sha256 - (base32 - "0iipbz5ydxxxk44q8ab0ylk7jpxjfhag4vgkhvpj67zs4s45sd8a")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Replace reference to external configobj. - (substitute* (find-files "." "\\.py$") - (("from astropy.extern import configobj") "import configobj") - (("from astropy.extern.configobj import validate") "import validate") - (("from astropy.extern.configobj.configobj import ") "from configobj import ") - (("from astropy.extern.configobj.validate import ") "from validate import ")))))) + (source + (origin + (method url-fetch) + (uri (pypi-uri "stpipe" version)) + (sha256 + (base32 "0iipbz5ydxxxk44q8ab0ylk7jpxjfhag4vgkhvpj67zs4s45sd8a")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Replace reference to external configobj. + (substitute* (find-files "." "\\.py$") + (("from astropy.extern import configobj") "import configobj") + (("from astropy.extern.configobj import validate") "import validate") + (("from astropy.extern.configobj.configobj import ") "from configobj import ") + (("from astropy.extern.configobj.validate import ") "from validate import ")))))) (arguments (list ;; See https://github.com/spacetelescope/stpipe/issues/114 #:test-flags #~(list "-k" "not test_roman_datamodel"))) (build-system pyproject-build-system) (propagated-inputs - (list python-asdf python-astropy python-crds python-stdatamodels)) - (native-inputs (list python-pytest python-pytest-doctestplus - python-pytest-openfiles python-setuptools-scm)) + (list python-asdf + python-astropy + python-crds + python-stdatamodels)) + (native-inputs + (list python-pytest + python-pytest-doctestplus + python-pytest-openfiles + python-setuptools-scm)) (home-page "https://github.com/spacetelescope/stpipe") (synopsis "Framework for calibration pipeline software") (description