From patchwork Wed May 24 21:51:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 50292 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 580EC27BBEA; Wed, 24 May 2023 22:53:32 +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 739E427BBE2 for ; Wed, 24 May 2023 22:53:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1wPq-0006fN-8y; Wed, 24 May 2023 17:53:06 -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 1q1wPo-0006eN-T4 for guix-patches@gnu.org; Wed, 24 May 2023 17:53:04 -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 1q1wPo-0005Nx-JY for guix-patches@gnu.org; Wed, 24 May 2023 17:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1wPo-0002U8-Dj for guix-patches@gnu.org; Wed, 24 May 2023 17:53:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63542] [PATCH v2 04/20] gnu: python-sunpy: Update to 4.1.5. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 21:53:04 +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.16849651409377 (code B ref 63542); Wed, 24 May 2023 21:53:04 +0000 Received: (at 63542) by debbugs.gnu.org; 24 May 2023 21:52:20 +0000 Received: from localhost ([127.0.0.1]:45329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1wP5-0002R5-FP for submit@debbugs.gnu.org; Wed, 24 May 2023 17:52:20 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:58577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1wOq-0002NV-BY for 63542@debbugs.gnu.org; Wed, 24 May 2023 17:52:07 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-307d58b3efbso980294f8f.0 for <63542@debbugs.gnu.org>; Wed, 24 May 2023 14:52:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684965118; x=1687557118; 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=USnRti9HZNLdi+a0tFneN7H0qop0bFZFbjt0kTurd1Y=; b=VSRO7Xh6c1DGAxfxgTQA/6vGy+NVyMvq/hrzk0CGMwlUhe4UFcI/i4rdOEkDDaJQ2Z f/WFCjiegH+ERky70LWP1EZNW1b6yNfiyIrgxM5+kGiCmb4PeehzdazWpzkIX7rm/6uW 1fQ6gWKvvmoJhrYOVWHVp0sXFp+q78VUxX1158h6p7vDbqRJyhrMGFQrLqkzXs/Jy7DW zKPwKwqwuoe7YklEhayVZOEAFHgEYfTC9UlrTLnnKmIYqS88+Y0Ou8Fsme5ETI9wIKD8 ZtJyB7Mdye8J1lUcJD96Fk7+WgmoAaqwa22MNl7kwM1jDBVYJAVjPARhZFbtzQ7EELxo 1DNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684965118; x=1687557118; 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=USnRti9HZNLdi+a0tFneN7H0qop0bFZFbjt0kTurd1Y=; b=VzSqc0M4HJCqSHewkS7k9sl54q3qrg3zqyI524rcetez5TAkGCf6SIsbcwmWwRNoAt n6BlbvEBMjV2glziUPHSdfs/0M1A5rMDX26gGG2u8dLeZ4q0hN9i7I4YOKeyT1rtjOsk kIcq59rCNG8WGZBcf10RlPzuPgweZvcrZqoRnSzCKEfIhy8qCNJ3NJh9AMVAmXIMGNVH QafEVdbKBcZQY/mhnwg/9786e6k4wa5YXN0UZQ5VKtWoR732UB/jMTjp96TP+YPNCQL+ 8OPV3vJW7Nt8i9ugL6M+cIyHJyRP5hDvTMgFwhry4rUv9+32dwW1Lzxo9lsXFEYSww11 6ZtQ== X-Gm-Message-State: AC+VfDyzd7wV5HnBLObS5LyKkdmglsHtGKwL1MIerk/bsHgG1J0NBjna +mJbjL518TuKJ3BHLsr5rU6Lni6wLWI= X-Google-Smtp-Source: ACHHUZ4/Yml7RxMOaZ9LWcgacPfzoeNxUpQPzv4ZJL9OIjRqyNEaRurghpumWlA6RNyNRz4Fu3fwDA== X-Received: by 2002:adf:f048:0:b0:304:4460:11e7 with SMTP id t8-20020adff048000000b00304446011e7mr861948wro.51.1684965118638; Wed, 24 May 2023 14:51:58 -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 c13-20020a056000104d00b0030632833e74sm15609806wrx.11.2023.05.24.14.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 14:51:58 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 24 May 2023 22:51:38 +0100 Message-Id: <7dbe28c6339c8473cd1ec5d9551f6a64c288270c.1684964119.git.sharlatanus@gmail.com> 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 | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5c07ff2c8d..196aeba0e3 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,26 +1907,10 @@ (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 + (list opencv ; For tests, includes OpenCV-Python + python-aiohttp python-extension-helpers python-hvpy python-packaging @@ -1950,7 +1939,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