From patchwork Fri Jan 19 08:37:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 59119 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 94E5C27BBEC; Fri, 19 Jan 2024 08:58:22 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 C4D5327BBE2 for ; Fri, 19 Jan 2024 08:58:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQkhO-0003li-AK; Fri, 19 Jan 2024 03:58:02 -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 1rQkhM-0003kY-LX for guix-patches@gnu.org; Fri, 19 Jan 2024 03:58:00 -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 1rQkhM-0005RT-Cf for guix-patches@gnu.org; Fri, 19 Jan 2024 03:58:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQkhO-00074l-F6 for guix-patches@gnu.org; Fri, 19 Jan 2024 03:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68580] [PATCH 1/2] gnu: python-osmnx: Update to 1.8.1. References: <87plxxu2xl.fsf@troyfigiel.com> In-Reply-To: <87plxxu2xl.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jan 2024 08:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68580 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68580@debbugs.gnu.org Received: via spool by 68580-submit@debbugs.gnu.org id=B68580.170565462327091 (code B ref 68580); Fri, 19 Jan 2024 08:58:02 +0000 Received: (at 68580) by debbugs.gnu.org; 19 Jan 2024 08:57:03 +0000 Received: from localhost ([127.0.0.1]:57471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQkgQ-00072s-V0 for submit@debbugs.gnu.org; Fri, 19 Jan 2024 03:57:03 -0500 Received: from mout-p-101.mailbox.org ([2001:67c:2050:0:465::101]:53710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQkgO-00072I-Mh for 68580@debbugs.gnu.org; Fri, 19 Jan 2024 03:57:01 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4TGYQ90Sd9z9sXk for <68580@debbugs.gnu.org>; Fri, 19 Jan 2024 09:56:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1705654609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=PbMCzoM9L0R9HHGtb+53vGCU3nm4ZzQRV0Uk8H30HE0=; b=jkJOWxat1zcWVR5EzxIib5CYrQ2KXXflEUQ+Gt7rKFrEiLTHCtL2rFIH5P1UZ3L3HG2MLd ups9RNyvGydlFPYHvDyTmc/rmX6tU/6ymnMHTn6UbVqQJ8NaYwrjA4Sq57n8lPTQeszo+5 IS7DM0FwOntASzFzY9LZEe4bunmXXZVuxID+ZEj+zroUTA1kBq8nbchOqDQDZvc9DRpC90 wBMMChtPDwcq9QDc206VPxCd6F0OZpaDca+PpfJT/RHWOZLhKk/kqYFsWP0hW333iSIyiF JxHt9TLU9WUeZzkp7E1Ct+jqdnagPq0ByhB5YellJxEVUglu8nZps5Py8yaEuA== From: Troy Figiel Date: Fri, 19 Jan 2024 09:37:23 +0100 Message-ID: <87o7dhu2en.fsf@troyfigiel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4TGYQ90Sd9z9sXk 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): Update to 1.8.1. [arguments]<#:test-flags>: Add test_geocoder and test_features to ignored tests. Remove test_geocode_to_df and test_geometries from ignored tests. [propagated-inputs]: Remove python-pyproj and python-rtree. [native-inputs]: Add python-hatchling, remove python-numpy. --- gnu/packages/geo.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 14e2d9f16b..04166c8c53 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -977,7 +977,7 @@ (define-public python-geopandas (define-public python-osmnx (package (name "python-osmnx") - (version "1.1.2") + (version "1.8.1") (source (origin ; Fetch from github as the pypi package is missing the tests dir. @@ -987,7 +987,7 @@ (define-public python-osmnx (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n8qjn184p5a2s3j6x6iyc1i7p3l3xnbqqxm6ajwgwv6j5fw1d5a")))) + (base32 "0n238n07pp5jw9cg8nqw9qhpkw8plzb5imz1gxbliw2l1idqyjcl")))) (build-system pyproject-build-system) (arguments (list @@ -995,8 +995,8 @@ (define-public python-osmnx '(list "-k" (string-append ;; The following tests require network access. - "not test_geocode_to_gdf" - " and not test_stats" + "not test_stats" + " and not test_geocoder" " and not test_osm_xml" " and not test_elevation" " and not test_routing" @@ -1005,7 +1005,7 @@ (define-public python-osmnx " and not test_api_endpoints" " and not test_graph_save_load" " and not test_graph_from_functions" - " and not test_geometries")))) + " and not test_features")))) (propagated-inputs (list python-folium python-geopandas @@ -1013,12 +1013,10 @@ (define-public python-osmnx python-networkx python-numpy python-pandas - python-pyproj python-requests - python-rtree python-shapely)) (native-inputs - (list python-numpy python-pytest)) + (list python-hatchling python-pytest)) (home-page "https://github.com/gboeing/osmnx") (synopsis "Retrieve, model, analyze, and visualize OpenStreetMap street networks") From patchwork Fri Jan 19 08:38:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 59120 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 A3D9A27BBE2; Fri, 19 Jan 2024 08:58:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 ECE2C27BBEB for ; Fri, 19 Jan 2024 08:58:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQkhO-0003ln-Kp; Fri, 19 Jan 2024 03:58:02 -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 1rQkhN-0003kh-2r for guix-patches@gnu.org; Fri, 19 Jan 2024 03:58:01 -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 1rQkhM-0005Re-Q7 for guix-patches@gnu.org; Fri, 19 Jan 2024 03:58:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQkhO-00074s-Sl for guix-patches@gnu.org; Fri, 19 Jan 2024 03:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68580] [PATCH 2/2] gnu: python-osmnx: Reformat with guix style. References: <87plxxu2xl.fsf@troyfigiel.com> In-Reply-To: <87plxxu2xl.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jan 2024 08:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68580 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68580@debbugs.gnu.org Received: via spool by 68580-submit@debbugs.gnu.org id=B68580.170565465227135 (code B ref 68580); Fri, 19 Jan 2024 08:58:02 +0000 Received: (at 68580) by debbugs.gnu.org; 19 Jan 2024 08:57:32 +0000 Received: from localhost ([127.0.0.1]:57475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQkgu-00073b-C7 for submit@debbugs.gnu.org; Fri, 19 Jan 2024 03:57:32 -0500 Received: from mout-p-202.mailbox.org ([2001:67c:2050:0:465::202]:55078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQkgs-00073N-VW for 68580@debbugs.gnu.org; Fri, 19 Jan 2024 03:57:31 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4TGYQm227sz9spd for <68580@debbugs.gnu.org>; Fri, 19 Jan 2024 09:57:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1705654640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=2QREfeXO0nXnN1qCiiVAScISqy3rlTuSdHuMB7lfyPw=; b=T12SbElzgeFyS0kmmAm2ZXc/27/6V1SJX9zaEmFHlkFj/76iFI9O2td8yE3KnY34bNS4WH OGT3HcKdnjWI1/P+wdHmuYXmy+ftdUGC5//XZho9CQ1Q5CvfFe3XUnFlNEM7cfMfP1uNpr qj3idupfIYfPqytNc+42Ltu33hKjKbiB5QoC1r7H8lsPeWlXDsBoF5TN+xG5eqIN8cxunP qL/4l5f5uhvRU7ZIzxcGv6MEUC26MXUJpSoceBhjIbmtvo7BVuXY0aWA1gz28fs+LCGQ8t 3b8kOokgp8itk31zIA3xwx9FakygrJwjQ+U7lq/ZLWuRj2/pgGKYkrs5HexT1A== From: Troy Figiel Date: Fri, 19 Jan 2024 09:38:16 +0100 Message-ID: <87mst1u2ds.fsf@troyfigiel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4TGYQm227sz9spd 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): Reformat with guix style. --- gnu/packages/geo.scm | 55 +++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 04166c8c53..1ea0bffcd4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -980,7 +980,7 @@ (define-public python-osmnx (version "1.8.1") (source (origin - ; Fetch from github as the pypi package is missing the tests dir. + ;; Fetch from github as the pypi package is missing the tests dir. (method git-fetch) (uri (git-reference (url "https://github.com/gboeing/osmnx") @@ -991,37 +991,34 @@ (define-public python-osmnx (build-system pyproject-build-system) (arguments (list - #:test-flags - '(list "-k" - (string-append - ;; The following tests require network access. - "not test_stats" - " and not test_geocoder" - " 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_features")))) - (propagated-inputs - (list python-folium - python-geopandas - python-matplotlib - python-networkx - python-numpy - python-pandas - python-requests - python-shapely)) - (native-inputs - (list python-hatchling python-pytest)) + #:test-flags '(list "-k" + (string-append + ;; The following tests require network access. + "not test_stats" + " and not test_geocoder" + " 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_features")))) + (propagated-inputs (list python-folium + python-geopandas + python-matplotlib + python-networkx + python-numpy + python-pandas + python-requests + python-shapely)) + (native-inputs (list python-hatchling python-pytest)) (home-page "https://github.com/gboeing/osmnx") (synopsis - "Retrieve, model, analyze, and visualize OpenStreetMap street networks") + "Retrieve, model, analyze, and visualize OpenStreetMap street networks") (description - "OSMnx is a Python library that lets you download geospatial data + "OSMnx is a Python library that lets you download geospatial data from OpenStreetMap and model, project, visualize, and analyze real-world street networks and any other geospatial geometries. You can download and model walkable, drivable, or bikeable urban networks with a single