From patchwork Sun Apr 2 17:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 48938 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 B96DF171AB; Sun, 2 Apr 2023 18:47:54 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 7368E17277 for ; Sun, 2 Apr 2023 18:47:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pj1nL-0002a6-CY; Sun, 02 Apr 2023 13:47:11 -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 1pj1nF-0002Z3-9x for guix-patches@gnu.org; Sun, 02 Apr 2023 13:47:07 -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 1pj1nE-0002Pa-Vw for guix-patches@gnu.org; Sun, 02 Apr 2023 13:47:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pj1nE-0002yS-Rk for guix-patches@gnu.org; Sun, 02 Apr 2023 13:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62622] [PATCH 6/8] gnu: python-osmnx: Use pyproject-build-system. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Apr 2023 17:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62622@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 62622-submit@debbugs.gnu.org id=B62622.168045762011382 (code B ref 62622); Sun, 02 Apr 2023 17:47:04 +0000 Received: (at 62622) by debbugs.gnu.org; 2 Apr 2023 17:47:00 +0000 Received: from localhost ([127.0.0.1]:42584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj1nA-0002xV-FH for submit@debbugs.gnu.org; Sun, 02 Apr 2023 13:47:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj1n9-0002x6-2v for 62622@debbugs.gnu.org; Sun, 02 Apr 2023 13:46:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8A058240225 for <62622@debbugs.gnu.org>; Sun, 2 Apr 2023 19:46:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1680457613; bh=9eKmKiFhFmKycfd1o8L3hliGmpzWwjB2bijUfJV6RFE=; h=From:To:Cc:Subject:Date:From; b=apnoKLwJXhAg89GHqjCwCfWO10j2lKPTxV2tl7aSMXMg92z2G2bcdCwa+EOYiNZrk bQ6oiSrjTcXJidvtAfQA0b9Ax1W0TpUU1PztM9TUtif2bEnQbkLYeUhA5kCAdYMPMC 9oXmslkx8wqCD7YxVvMywdsQN+7YgraWmT0kXApa2XExeBdN+XG/5HQA8igjUriH+p 9sD4IHyfN45Z8TlWRm/1IjCfngioZNQJFeaZXN5UeBa6HKnCXrdNewDIqJRtNFqvPi Yy1o99UXnezxzu7TVaZbLRn3NGE77mQGXze75invo9lauzY5kRI3wd6sjyxdiMn8b9 xAGIeOvLVcHfg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PqM0Y0w1hz6tvC; Sun, 2 Apr 2023 19:46:53 +0200 (CEST) From: Felix Gruber Date: Sun, 2 Apr 2023 17:45:49 +0000 Message-Id: <20230402174551.159212-6-felgru@posteo.net> In-Reply-To: <20230402174241.158923-1-felgru@posteo.net> References: <20230402174241.158923-1-felgru@posteo.net> 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/geo.scm (python-osmnx)[build-system]: Use pyproject-build-system instead of python-build-system. [arguments]: Remove custom 'check phase. Instead define test-flags to disable network tests. --- gnu/packages/geo.scm | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index e046797a3f..76a42c4140 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -44,6 +44,7 @@ (define-module (gnu packages geo) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix gexp) @@ -854,30 +855,24 @@ (define-public python-osmnx (file-name (git-file-name name version)) (sha256 (base32 "1n8qjn184p5a2s3j6x6iyc1i7p3l3xnbqqxm6ajwgwv6j5fw1d5a")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - ; TODO: Disable network tests - (invoke "pytest" "tests" - "-k" - (string-append - ;; The following tests require network access. - "not test_geocode_to_gdf" - " and not test_stats" - " and not test_osm_xml" - " and not test_elevation" - " and not test_routing" - " and not test_plots" - " and not test_find_nearest" - " and not test_api_endpoints" - " and not test_graph_save_load" - " and not test_graph_from_functions" - " and not test_geometries")))))))) + (list + #:test-flags + '(list "-k" + (string-append + ;; The following tests require network access. + "not test_geocode_to_gdf" + " and not test_stats" + " and not test_osm_xml" + " and not test_elevation" + " and not test_routing" + " and not test_plots" + " and not test_find_nearest" + " and not test_api_endpoints" + " and not test_graph_save_load" + " and not test_graph_from_functions" + " and not test_geometries")))) (propagated-inputs (list python-folium python-geopandas