From patchwork Fri Nov 17 12:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56566 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 8525527BBE2; Fri, 17 Nov 2023 10:22:09 +0000 (GMT) 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=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 37FD227BBE9 for ; Fri, 17 Nov 2023 10:22:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3vyr-0001F5-2d; Fri, 17 Nov 2023 05:21:45 -0500 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 1r3vyJ-0000vz-TO for guix-patches@gnu.org; Fri, 17 Nov 2023 05:21:12 -0500 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 1r3vyJ-00051P-IL for guix-patches@gnu.org; Fri, 17 Nov 2023 05:21:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3vyI-0001HP-QH; Fri, 17 Nov 2023 05:21:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67237] [PATCH 20/32] gnu: python-astroquery: Improve 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: Fri, 17 Nov 2023 10:21:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67237 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67237@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 67237-submit@debbugs.gnu.org id=B67237.17002164514600 (code B ref 67237); Fri, 17 Nov 2023 10:21:10 +0000 Received: (at 67237) by debbugs.gnu.org; 17 Nov 2023 10:20:51 +0000 Received: from localhost ([127.0.0.1]:45224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3vxy-0001C1-N0 for submit@debbugs.gnu.org; Fri, 17 Nov 2023 05:20:51 -0500 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]:47206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3vxi-000186-C3 for 67237@debbugs.gnu.org; Fri, 17 Nov 2023 05:20:34 -0500 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-5079f6efd64so2398142e87.2 for <67237@debbugs.gnu.org>; Fri, 17 Nov 2023 02:20:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700216428; x=1700821228; 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=ZO4DXnT4scg5GAcdOVEljhiRcoiPYlE//yCLuKpBJ1M=; b=YHwava/p/+XFlDUsQ4yUlxWfHFNQ8heHzmeQma0RFdgpqehJtmx+v48D8PsjWzgnyu dZpAZXhhwZipP3y4PX2memy0xVwZ/rt/tXJ7fuBclA19JJ47i5sdL81ha3uyE08ZyAmv CbSD6Hur1f1VwYoLcTJaJoDSJfaW9GduyrEkyMvRS3ffUtZ9IoWru7ppvMNtzyKAVCtl ssQjnhhd4i67oT35gqy7IPRNQAX51yFKF3WlgA6FORvU/663z9Y01t1zzN75QeSPkwHw TcU3o3T2Z6yskE3m5gijntrYhOKGRezd54nZsUFVGgrKJhCpPQpgSbBP/e3zeZD3ldR1 UKCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700216428; x=1700821228; 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=ZO4DXnT4scg5GAcdOVEljhiRcoiPYlE//yCLuKpBJ1M=; b=Q5EXaF5TAEx1qrvaQxPd+kxk0+Udi5ct7YwHFKb+xTuIFPbUGLMzny9W8vduxsUBfj vkq/YBpstiaafksFQXv/ptBFtE+fLabQRTJPDiNqt5pFZQDnE9c7y5uQC06gYWN4u991 ectv0IqQMI+nznCS8msDfxwygORAck+9R777BfToGaEqnFUmGkUgHS6anA8CbLDez8oM g9equEuqw/sunLC8wDVg5VsUpyQGUEQxcN4jqc0R5nk7Jhy5ziNfh5AwFsHdDdJrBPzO YUmAfF2W2nAuPyYzxNYThONOZc9KQXePuhl1UugfcshHISkFo975FPBPHKG6rjKrGfkZ Oy+g== X-Gm-Message-State: AOJu0YwFPgszCJjscxaYouuWjFE4lLFHTW+OnWhi3/rsYt+pq2KJFAbv DRYImSJIh6Zht71Hwcy90s8A8aNixEAxPQ== X-Google-Smtp-Source: AGHT+IGfJmh7Lu05x+num4HlLmoKEjBpi/m80Oga3m6crkjGPoEs/OZi/tR6SIizLzxEKBbesJ7zqw== X-Received: by 2002:a19:6441:0:b0:509:11fa:a208 with SMTP id b1-20020a196441000000b0050911faa208mr12135764lfj.43.1700216428183; Fri, 17 Nov 2023 02:20:28 -0800 (PST) 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 t4-20020a5d4604000000b0032fbd0c7d04sm1858856wrq.55.2023.11.17.02.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 02:20:27 -0800 (PST) From: Sharlatan Hellseher Date: Fri, 17 Nov 2023 12:16:09 +0000 Message-ID: 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-astroquery): Improve package style. [build-system]: Swap to pyproject-build-system. [arguments]{phases}: Rename 'writable-home phase to 'prepare-test-environment to reflect the purpose, Add extra step configuring Pytest. [native-inputs]: Remove python-flask, python-jinja2. Add python-astropy-healpix, python-regions. Change-Id: Id3909a13e451a2f9d5f4f28511e9f04c6bceb738 --- gnu/packages/astronomy.scm | 41 +++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e9caced125..d12dccc208 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1614,19 +1614,27 @@ (define-public python-astroquery (uri (pypi-uri "astroquery" version)) (sha256 (base32 "1vhkzsqlgn3ji5by2rdf2gwklhbyzvpzb1iglalhqjkkrdaaaz1h")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-before 'check 'writable-home - (lambda _ ; some tests need a writable home - (setenv "HOME" (getcwd)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "--pyargs" "astroquery" - ;; Skip tests that require online data. - "-m" "not remote_data"))))))) + (list + #:test-flags + #~(list "--pyargs" "astroquery" + "-m" "not remote_data") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'prepare-test-environment + (lambda _ + (setenv "HOME" (getcwd)) ; some tests need a writable home + ;; To solve pytest/conftest issue. Pytest tries to load all + ;; files with word 'test' in them. + ;; + ;; ImportError while loading conftest ... + ;; _pytest.pathlib.ImportPathMismatchError: ... + ;; + (call-with-output-file "pytest.ini" + (lambda (port) + (format port "[pytest] +python_files = test_*.py")))))))) (propagated-inputs (list python-astropy python-beautifulsoup4 @@ -1636,12 +1644,13 @@ (define-public python-astroquery python-pyvo python-requests)) (native-inputs - (list python-flask - python-jinja2 + (list python-astropy-healpix python-matplotlib + ;; python-mocpy : Not packed yet, optional python-pytest-astropy - python-pytest-dependency)) - (home-page "https://www.astropy.org/astroquery/") + python-pytest-dependency + python-regions)) + (home-page "https://astroquery.readthedocs.io/en/latest/index.html") (synopsis "Access online astronomical data resources") (description "Astroquery is a package that contains a collection of tools to access online Astronomical data. Each web service has its own sub-package.")