From patchwork Sat Apr 20 23:22:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 63202 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 2AF6A27BBE2; Sun, 21 Apr 2024 00:25:08 +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 4726927BBE2 for ; Sun, 21 Apr 2024 00:25:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryK45-0002zA-DD; Sat, 20 Apr 2024 19:24:13 -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 1ryK3v-0002vw-5W for guix-patches@gnu.org; Sat, 20 Apr 2024 19:24:03 -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 1ryK3u-0002EH-RI for guix-patches@gnu.org; Sat, 20 Apr 2024 19:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryK49-0000A8-NI; Sat, 20 Apr 2024 19:24:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70489] [PATCH 13/47] gnu: python-astropy: Symplify package. 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 Apr 2024 23:24:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70489 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70489@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 70489-submit@debbugs.gnu.org id=B70489.1713655448466 (code B ref 70489); Sat, 20 Apr 2024 23:24:17 +0000 Received: (at 70489) by debbugs.gnu.org; 20 Apr 2024 23:24:08 +0000 Received: from localhost ([127.0.0.1]:38896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryK3x-00006p-Ub for submit@debbugs.gnu.org; Sat, 20 Apr 2024 19:24:07 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:52672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryK3B-0008NJ-ME for 70489@debbugs.gnu.org; Sat, 20 Apr 2024 19:23:21 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-417f5268b12so33969065e9.1 for <70489@debbugs.gnu.org>; Sat, 20 Apr 2024 16:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713655377; x=1714260177; 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=83aPVVrVwRgJs2uoLiUmMMg5zfNvAsSwj9tmhhENqdU=; b=K59KQtSVXhqTJFA/MOh4FxHjXSi/EOJWOYSLsh6Rmsaow3Ex3MlDRh94fgcCeuEYH4 /X2NyJGUbOAAWShAEridIzqCNRKH2Q+JYqyIhzq2fJgXjN/RAarviialp2Imv01UiKgp C1OzEeoC2LT4woh843xdTlUOQ0l7UA33Rlw6vm/nq+bNeCf/A6rbMe/Ewa/3sHg2BGUa xRq/Jdv8U2ealuj8CMRwRXMgFF67aReTfrNGjWI4fmfX+uST7y7HI1pdfE6NtRTcydMx aw9SRCcxwc8BDmRYQF1tplvppWY2QXVq38xxMSLpEMaB0jwyTbW9yz6sWHMXQpECIwVq DhkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713655377; x=1714260177; 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=83aPVVrVwRgJs2uoLiUmMMg5zfNvAsSwj9tmhhENqdU=; b=aOG+cuIVytUjXjhFiZ+4DzbGpVdr7Kn5ianr9lwzHxDMyGqTExTLUmSJ0nRqFROuhU IClz0LtRpQL2EUxzKQ9gtMmmUBSTHcnTIIY7KH2/PhsosDb+eggcrlN36ucIT10GaF0B Tdti9wKcvKInKx/xBZ7btVxLlwtTVmkGTmiGMwfcJQ/OIyqY2b5Jogr0Czt79QwjXfX9 xATWwFfLH9PyHChKFt09DQGrvp1MMIrFLXvPU5fyxnn8tysSQY2pho/WERGqEKXDHTRx lfvuvrnyeG3U4+Wf2b7Knzcj0TXIRDjK5px09HpDuXjZ5/DBZ3771aF/wgPLtlLDShG9 53Mw== X-Gm-Message-State: AOJu0YzpDCAeMWsrzpkBEeTvGHtSWfzpHxPkSX+2Docy2t02UbjP4LoZ GkLezi8zpQTJDX4nv5QA5MGV3piCz3FEKX2w59VZzZeM49PlkIc3wXIBISkk X-Google-Smtp-Source: AGHT+IEJkXFflP2VmGxP3DJS+YlxM7+bMVefRL2lyCUNznD5saZsnPIq40QNNXnpjdN88o7hFR1+Lg== X-Received: by 2002:a05:600c:1992:b0:418:93d1:ef2a with SMTP id t18-20020a05600c199200b0041893d1ef2amr5430897wmq.20.1713655376890; Sat, 20 Apr 2024 16:22:56 -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 g13-20020a05600c310d00b004196c93da22sm6474751wmo.2.2024.04.20.16.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Apr 2024 16:22:56 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 21 Apr 2024 00:22:02 +0100 Message-ID: <9b1e5844216479db0df08f8947c79b3c09ee86a4.1713654571.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-astropy): Simplify package. [build-system]: Swap to pyproject-build-system. [arguments] <#:phases>: Merge 'prepare-test-environment into custom 'check phase and move test arguments to <#:test-arguments>. Change-Id: I80098c3eb4e9d95ef2c651d5416196165be3f7c0 --- gnu/packages/astronomy.scm | 47 ++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 567cb54685..fc3c652132 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1565,9 +1565,20 @@ (define-public python-astropy ;; see https://github.com/astropy/astropy/pull/14311 (with-directory-excursion "cextern" (for-each delete-file-recursively '("expat" "wcslib"))))))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list + #:test-flags + #~(list "--pyargs" "astropy" + "-n" "auto" + "-k" (string-append + ;; Skip tests that need remote data. + "not remote_data" + ;; E astropy.samp.errors.SAMPProxyError: + ;; + " and not test_main" + ;; E ModuleNotFoundError: No module named 'wofz' + " and not test_pickle_functional")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'preparations @@ -1587,32 +1598,18 @@ (define-public python-astropy (add-before 'install 'writable-compiler (lambda _ (make-file-writable "astropy/_compiler.c"))) - (add-before 'check 'prepare-test-environment - (lambda _ - ;; Some tests require a writable home. - (setenv "HOME" "/tmp") - (make-file-writable "astropy/_compiler.c") - ;; Extensions have to be rebuilt before running the tests. - (invoke "python" "setup.py" "build_ext" "--inplace" - "-j" (number->string (parallel-job-count))))) - ;; TODO: The swap to pyproject-build-system introduced all tests - ;; failed due to pytest could not load conftest.py, find out how - ;; to resolve it and migrate completely to pyproject-build-system. (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? test-flags #:allow-other-keys) (when tests? - (invoke "python" "-m" "pytest" "--pyargs" "astropy" - ;; with -n : 133.00s - ;; without -n : 326.14s - "-n" (number->string (parallel-job-count)) - "-k" (string-append - ;; Skip tests that need remote data. - "not remote_data" - ;; E astropy.samp.errors.SAMPProxyError: - ;; - " and not test_main" - ;; E ModuleNotFoundError: No module named 'wofz' - " and not test_pickle_functional")))))))) + (setenv "HOME" "/tmp") + (make-file-writable "astropy/_compiler.c") + ;; Extensions have to be rebuilt before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace" + "-j" (number->string (parallel-job-count))) + ;; Step out of the source directory to avoid interference; we + ;; want to run the installed code with extensions etc. + (with-directory-excursion "/tmp" + (apply invoke "pytest" "-v" test-flags)))))))) (native-inputs (list pkg-config python-colorlog