From patchwork Tue May 16 23:23:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 50060 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 7AF9527BBEA; Wed, 17 May 2023 00:25:47 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 20C0127BBE9 for ; Wed, 17 May 2023 00:25:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pz42T-0005JT-6R; Tue, 16 May 2023 19:25:05 -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 1pz42R-0005IL-NS for guix-patches@gnu.org; Tue, 16 May 2023 19:25:03 -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 1pz42R-0002Nb-Fi for guix-patches@gnu.org; Tue, 16 May 2023 19:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pz42R-0004Hd-Br for guix-patches@gnu.org; Tue, 16 May 2023 19:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63542] [PATCH 04/19] gnu: python-sunpy: Update to 4.1.5. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 May 2023 23:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63542@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 63542-submit@debbugs.gnu.org id=B63542.168427944616275 (code B ref 63542); Tue, 16 May 2023 23:25:03 +0000 Received: (at 63542) by debbugs.gnu.org; 16 May 2023 23:24:06 +0000 Received: from localhost ([127.0.0.1]:48264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz41W-0004EF-2P for submit@debbugs.gnu.org; Tue, 16 May 2023 19:24:06 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:48206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz41N-0004BV-QU for 63542@debbugs.gnu.org; Tue, 16 May 2023 19:24:00 -0400 Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-307d20548adso27072f8f.0 for <63542@debbugs.gnu.org>; Tue, 16 May 2023 16:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684279432; x=1686871432; 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=l5bphu94++gI9F9jI59J7PVD7payFN5RmZ76/6FaM8w=; b=EbkJrvjNcVc6v5Kewlk47sMCR+SJaiKJbc7RggyrNDAtz5MhssK3zTnkl/tBVje6Je Cd0W4Tvqid1Q5iA2vBK4Gtqd2CiinjjLo+yllfYyyAUc5IUcecVaFVOMW9+g6PD5Ju1H d+t9TpKhQfDHf+1mArrIFmwQvDObI/UtZdz+58mffbDVBNDWWAe9Pe1OYfyeBPh/4R5f 2KDh7k/SpPbxH9FccvBUHav/1nTrBKJIGnRqHjh4wgQ7yt0+VnXNneXWTR6DZ0WKvVQu PlSeCXQMFgLoKWtW6I/Ix03ixsPrSOSBBtJFxncqaozPihoLm1Fp0WralRMNCKWuoYdC 4rCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684279432; x=1686871432; 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=l5bphu94++gI9F9jI59J7PVD7payFN5RmZ76/6FaM8w=; b=i/YPcm9IVD50GvOX/npb+iWO6ExOu1l2zp13zrCyJFLXxBTjVAiw5uHpZ3j68ou0df mAwUoCCcxQpoeGRLyCI4zmo5nEV1ucWwWcdkwvTTAVebrK0aRBLxdYfdhYVSkZ38yFIv X2DtddC4RH4PlPAQopwKXrNpmzq6C4nS5M409xh0JcXCE+ifbS42hQ8aGCn4KIb2JECM 0xLsrZ+Gpt5gJgHTR/Ru5W/7qSThAdADF5iLZi7RLMlBHLZYcyD6bFPOU3YlAuzrtjMd rIYhBtWRfUNvGcSaO7uwV/uAhtY8GYg1pcdXkBqe+XZ8THLA762xA1zVJsXHUxp2B3y2 EJLQ== X-Gm-Message-State: AC+VfDzrmczyPeoj3Mjg1HaAGZvcQlCW3hTlx/ple1K8tbdcFL5Q1RSa yzgNSU07cK8CVed/HOqarU3VMXgEjUI= X-Google-Smtp-Source: ACHHUZ5wJ7a6PRpbDYe0g6kA0P954X1446H8englGe9MthG9DTt1ANVl+VUiFLPeqHd7vHUCHjU0iw== X-Received: by 2002:a05:6000:48:b0:307:7c2d:dc79 with SMTP id k8-20020a056000004800b003077c2ddc79mr26415900wrx.16.1684279432060; Tue, 16 May 2023 16:23:52 -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 n10-20020a5d67ca000000b0030796e103a1sm949609wrw.5.2023.05.16.16.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 16:23:51 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 17 May 2023 00:23:33 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 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-sunpy): Update to 4.1.5, simplify package. [arguments]{test-flags}: Disable 2 failing tests. [arguments]{phases}: Simplify prepare-test-environment by remove redundant substitution. [inputs]: Add opencv for OpenCV-Pyton support. --- gnu/packages/astronomy.scm | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5c07ff2c8d..10c435b00e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1885,16 +1885,21 @@ (define-public python-sgp4 (define-public python-sunpy (package (name "python-sunpy") - (version "4.1.1") + (version "4.1.5") (source (origin (method url-fetch) (uri (pypi-uri "sunpy" version)) (sha256 - (base32 "1h8dnsic96bxm5l278vk6jj5h4bh1b143fghsvv5rhigk137vysp")))) + (base32 "1j5g0ivsrc5ji9s7jc3kcbi2injfs3y31pm3priycljwcsxspkpm")))) (build-system pyproject-build-system) (arguments (list + #:test-flags + #~(list "-k" (string-append + ;; XXX: Failed: DID NOT RAISE + "not test_main_nonexisting_module" + " and not test_main_stdlib_module")) #:phases #~(modify-phases %standard-phases (add-before 'install 'writable-compiler @@ -1902,24 +1907,7 @@ (define-public python-sunpy (make-file-writable "sunpy/_compiler.c"))) (add-before 'check 'prepare-test-environment (lambda _ - (setenv "HOME" "/tmp") - (make-file-writable "sunpy/_compiler.c") - ;; TODO: (Sharlatan-20221106T115800+0000): Review failing tests - (substitute* "sunpy/image/tests/test_transform.py" - (("def test_clipping") "def __off_test_clipping") - (("def test_nans") "def __off_test_nans") - (("def test_endian") "def __off_test_endian")) - (substitute* "sunpy/map/tests/test_mapbase.py" - (("def test_derotating_nonpurerotation_pcij") - "def __off_test_derotating_nonpurerotation_pcij")) - (substitute* "sunpy/map/sources/tests/test_mdi_source.py" - (("def test_synoptic_source") - "def __off_test_synoptic_source")) - (substitute* "sunpy/tests/tests/test_self_test.py" - (("def test_main_nonexisting_module") - "def __off_test_main_nonexisting_module") - (("def test_main_stdlib_module") - "def __off_test_main_stdlib_module"))))))) + (setenv "HOME" "/tmp")))))) (native-inputs (list python-aiohttp python-extension-helpers @@ -1932,6 +1920,8 @@ (define-public python-sunpy python-pytest-mpl python-pytest-xdist python-setuptools-scm)) + (inputs + (list opencv)) ; Includes OpenCV-Python (propagated-inputs (list parfive python-asdf @@ -1950,7 +1940,6 @@ (define-public python-sunpy python-matplotlib python-mpl-animators python-numpy - ;; python-opencv-python ; not packed yet python-pandas python-reproject python-scikit-image