From patchwork Thu May 19 19:46:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 39530 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 331DC27BBEA; Thu, 19 May 2022 20:47:14 +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_INVALID, DKIM_SIGNED,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 EDEA027BBE9 for ; Thu, 19 May 2022 20:47:13 +0100 (BST) Received: from localhost ([::1]:47690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrm77-0005aq-2o for patchwork@mira.cbaines.net; Thu, 19 May 2022 15:47:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrm6w-0005ZU-6b for guix-patches@gnu.org; Thu, 19 May 2022 15:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrm6v-0002QC-UI for guix-patches@gnu.org; Thu, 19 May 2022 15:47:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrm6v-000387-S0 for guix-patches@gnu.org; Thu, 19 May 2022 15:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55528] [PATCH 1/2] gnu: python-rtree: Update to 1.0.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 May 2022 19:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55528 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55528@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 55528-submit@debbugs.gnu.org id=B55528.165298957911958 (code B ref 55528); Thu, 19 May 2022 19:47:01 +0000 Received: (at 55528) by debbugs.gnu.org; 19 May 2022 19:46:19 +0000 Received: from localhost ([127.0.0.1]:36642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrm6F-00036n-IO for submit@debbugs.gnu.org; Thu, 19 May 2022 15:46:19 -0400 Received: from mout02.posteo.de ([185.67.36.66]:42293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrm6C-00036Z-Tr for 55528@debbugs.gnu.org; Thu, 19 May 2022 15:46:18 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4B52A240109 for <55528@debbugs.gnu.org>; Thu, 19 May 2022 21:46:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1652989571; bh=oBSF8vvvc5n2gX0FY5uoLmj9t6p4VZM15av/Hs5Lcvk=; h=From:To:Cc:Subject:Date:From; b=gFAkZsu1Ca+Ci44Zc9aqxCuWU8OPpw0ZC2igClXT4aHJamKTKK9o9twafSbt6ntW8 Fy/OoE2PC26bGoBo3Lo+zWcJ31c1eeJaJ8TZZflqcWoxm5k/swc6mexlF+ndd24aH5 f+SLgNPWia4BNWoM0pfPgpON+iqNieLAVGbZp5xtl3MPEpS2fOrrAVGDX6Per7y63P 3VWsdoVQOt5BIKfLS8e4g1vjww5SfayUeDCZIm04/W5jtY3F+BSEZIiYgo8wnHi38d xZvbA94zavjiGeOOn8kdibM0JrCLfPV6i+b5aAtunV8ICIyMgSXULxWEc5na13pUo9 ytQ1OP+cLdWtA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4L40hy4Np0z9rxG; Thu, 19 May 2022 21:46:10 +0200 (CEST) From: Felix Gruber Date: Thu, 19 May 2022 19:46:05 +0000 Message-Id: <20220519194606.4548-1-felgru@posteo.net> In-Reply-To: <20220519194407.4435-1-felgru@posteo.net> References: <20220519194407.4435-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (python-rtree): Update to 1.0.0. [arguments]: Fix 'find-libspatialindex phase. --- gnu/packages/geo.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0c9240eea7..37a3e6d179 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1486,27 +1486,28 @@ persisted. (define-public python-rtree (package (name "python-rtree") - (version "0.9.7") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "Rtree" version)) (sha256 - (base32 "0gna530vy6rh76035cqh7i2lx199cvxjrzjczg9rm6k96k5751xy")))) + (base32 "10lnhf67c9pb0yisxdqmb52dy6lj1za1h9d4p69v0ihk2a138j6h")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'find-libspatialindex (lambda* (#:key inputs #:allow-other-keys) - (setenv "SPATIALINDEX_C_LIBRARY" - (string-append (assoc-ref inputs "libspatialindex") - "/lib/libspatialindex.so")))) + (let ((libspatialindex (assoc-ref inputs "libspatialindex"))) + (substitute* "rtree/finder.py" + (("find_library\\(\"spatialindex_c\"\\)") + (string-append "\"" libspatialindex + "/lib/libspatialindex_c.so\"")))))) (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (lambda* (#:key outputs tests? #:allow-other-keys) (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "python" "-m" "pytest"))))))) + (invoke "pytest"))))))) (native-inputs (list python-numpy python-pytest python-wheel)) (inputs From patchwork Thu May 19 19:46:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 39531 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 884B227BBEA; Thu, 19 May 2022 20:47:15 +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_INVALID, DKIM_SIGNED,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 430F627BBE9 for ; Thu, 19 May 2022 20:47:15 +0100 (BST) Received: from localhost ([::1]:47750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrm78-0005dV-CA for patchwork@mira.cbaines.net; Thu, 19 May 2022 15:47:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrm6w-0005Zr-KU for guix-patches@gnu.org; Thu, 19 May 2022 15:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrm6w-0002QL-Bq for guix-patches@gnu.org; Thu, 19 May 2022 15:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrm6w-00038F-96 for guix-patches@gnu.org; Thu, 19 May 2022 15:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55528] [PATCH 2/2] gnu: Add python-osmnx Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 May 2022 19:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55528 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55528@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 55528-submit@debbugs.gnu.org id=B55528.165298958211972 (code B ref 55528); Thu, 19 May 2022 19:47:02 +0000 Received: (at 55528) by debbugs.gnu.org; 19 May 2022 19:46:22 +0000 Received: from localhost ([127.0.0.1]:36645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrm6H-000371-Sv for submit@debbugs.gnu.org; Thu, 19 May 2022 15:46:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrm6F-00036c-HY for 55528@debbugs.gnu.org; Thu, 19 May 2022 15:46:20 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 75A27240027 for <55528@debbugs.gnu.org>; Thu, 19 May 2022 21:46:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1652989573; bh=UPI+mVV3DLAlyM91YTw7WQuMYbRAO/7HCoCJfZiKJBg=; h=From:To:Cc:Subject:Date:From; b=U2YfCmPk6hABnBSi0bP5Ui4Z5LJ8rdBTbMw7lyoJKyAKxV85AWHBPMcDv9NqRD9tT g3GU6zD3thwAA4eC0KUwF6rA2NUijvYwZVCduE8/qEZnt/oZ7cAkFW0KWjRqWaPgwL cp2z6dIHB4mEJu2KWTUAC8luNeEvgj6SOCxE0PZyQDgDK64DdBCOFT6cJm3difimr4 pp/YAtxPGXllqG7165sgS8PSSFWiGlE00y1fWQpm5zpDAzoKjgePKmFDy6xNfm2m/9 v74RIudYjNFSdAfkZzgTA+mGMEHI9MqfPPgc1ECYqFPsvbcNnyNawpeRq18lUhDrS8 KC4wThDUxj0Lw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4L40j05dXyz6tmX; Thu, 19 May 2022 21:46:12 +0200 (CEST) From: Felix Gruber Date: Thu, 19 May 2022 19:46:06 +0000 Message-Id: <20220519194606.4548-2-felgru@posteo.net> In-Reply-To: <20220519194407.4435-1-felgru@posteo.net> References: <20220519194407.4435-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (python-osmnx): New variable. --- gnu/packages/geo.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37a3e6d179..ea7483f16f 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -739,6 +739,71 @@ enables you to easily do operations in Python that would otherwise require a spatial database such as PostGIS.") (license license:bsd-3))) +(define-public python-osmnx + (package + (name "python-osmnx") + (version "1.1.2") + (source + (origin + ; Fetch from github as the pypi package is missing the tests dir. + (method git-fetch) + (uri (git-reference + (url "https://github.com/gboeing/osmnx") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n8qjn184p5a2s3j6x6iyc1i7p3l3xnbqqxm6ajwgwv6j5fw1d5a")))) + (build-system python-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")))))))) + (propagated-inputs + (list python-folium + python-geopandas + python-matplotlib + python-networkx + python-numpy + python-pandas + python-pyproj + python-requests + python-rtree + python-shapely)) + (native-inputs + (list python-numpy python-pytest)) + (home-page "https://github.com/gboeing/osmnx") + (synopsis + "Retrieve, model, analyze, and visualize OpenStreetMap street networks") + (description + "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 +line of Python code then easily analyze and visualize them. You can +just as easily download and work with other infrastructure types, +amenities/points of interest, building footprints, elevation data, +street bearings/orientations, and speed/travel time.") + (license license:expat))) + (define-public mapnik (package (name "mapnik")