From patchwork Tue Sep 28 06:34:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 33385 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 E315027BBE3; Tue, 28 Sep 2021 07:36:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A49FE27BBE1 for ; Tue, 28 Sep 2021 07:36:36 +0100 (BST) Received: from localhost ([::1]:51692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV6jD-00043f-OV for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 02:36:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV6ih-0003UT-5p for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV6ig-0007jx-Ua for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mV6ig-0000NB-Rb for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50812] [PATCH v4 1/5] gnu: proj: Update to 7.2.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 06:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50812@debbugs.gnu.org Cc: Guillaume Le Vaillant , Felix Gruber , Xinglu Chen , Maxime Devos Received: via spool by 50812-submit@debbugs.gnu.org id=B50812.16328109221316 (code B ref 50812); Tue, 28 Sep 2021 06:36:02 +0000 Received: (at 50812) by debbugs.gnu.org; 28 Sep 2021 06:35:22 +0000 Received: from localhost ([127.0.0.1]:43566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6i2-0000LA-7g for submit@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6hz-0000Kl-KQ for 50812@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:20 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C17EA240028 for <50812@debbugs.gnu.org>; Tue, 28 Sep 2021 08:35:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632810913; bh=ig8SXw2r88MfaE68tpnJOdVl7ygje13zji2dgXpICFU=; h=From:To:Cc:Subject:Date:From; b=hIXxJ8S7UPcaym+PVrmGt98esyb51vgOs0BhdHX7myl6Wxx1BHrRB9nbXHURF3kRJ 5+AxyADYrnZTDDp9Ex6ue+oYBCiXiAtVhysQ2gEXzJzJfmxX44CMi4gOT3OLVSxRJW 4/pVrm55yjTcy0zPD26yFur7MpNH8lJ3qOcNh41+0nh+5aRcnJyKgTBjG0uT+7xV6E DF6FabZGKyrQAAwDMgLjb3eReN+OuPJC7EnGsKEKi/ZGfQKWfm2kBEMicTMtAKsxo4 PvmGVPXhPPKq0/KZnPEWUhp40/IUJEplX7lvv3biO4Jj1/P14K+aofpgIffbDDffsu wlVWxqPD/yQEQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJV9r5zyJz6tmH; Tue, 28 Sep 2021 08:35:12 +0200 (CEST) From: Felix Gruber Date: Tue, 28 Sep 2021 06:34:40 +0000 Message-Id: <20210928063444.466158-2-felgru@posteo.net> In-Reply-To: <20210928063444.466158-1-felgru@posteo.net> References: <20210926085219.13547-1-felgru@posteo.net> <20210928063444.466158-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 (proj): Update to 7.2.1. [build-system]: Change to cmake-build-system. [arguments]: Add configure flag to find googletest. [inputs]: Add curl, libjpeg-turbo and libtiff. [native-inputs]: Add googletest. [description]: Consistently call the package Proj, instead of Proj, PROJ or proj. Use @acronym to define CRS. --- gnu/packages/geo.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9d4a1a8955..ec45601ef4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -514,7 +514,7 @@ fully fledged Spatial SQL capabilities.") (define-public proj (package (name "proj") - (version "6.3.1") + (version "7.2.1") (source (origin (method url-fetch) @@ -522,22 +522,28 @@ fully fledged Spatial SQL capabilities.") version ".tar.gz")) (sha256 (base32 - "1y46ij32j9b4x1kjnnlykcwk3kkjwkg44sfc1ziwm3a3g0ki3q3d")))) - (build-system gnu-build-system) + "050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON"))) (inputs - `(("sqlite" ,sqlite))) + `(("curl" ,curl) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libtiff" ,libtiff) + ("sqlite" ,sqlite))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) (home-page "https://proj.org/") (synopsis "Coordinate transformation software") (description "Proj is a generic coordinate transformation software that transforms -geospatial coordinates from one coordinate reference system (CRS) to another. -This includes cartographic projections as well as geodetic transformations. -PROJ includes command line applications for easy conversion of coordinates -from text files or directly from user input. In addition, proj also exposes -an application programming interface that lets developers use the -functionality of proj in their own software.") +geospatial coordinates from one @acronym{CRS, coordinate reference system} +to another. This includes cartographic projections as well as geodetic +transformations. Proj includes command line applications for easy +conversion of coordinates from text files or directly from user input. +In addition, Proj also exposes an application programming interface that +lets developers use the functionality of Proj in their own software.") (license (list license:expat ;; src/projections/patterson.cpp license:asl2.0 From patchwork Tue Sep 28 06:34:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 33386 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 4F9AE27BBE3; Tue, 28 Sep 2021 07:36:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 111FF27BBE1 for ; Tue, 28 Sep 2021 07:36:41 +0100 (BST) Received: from localhost ([::1]:52040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV6jI-0004JE-5E for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 02:36:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV6ih-0003UV-Mi for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60272) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV6ih-0007kV-EX for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mV6ih-0000NI-7y for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50812] [PATCH v4 2/5] gnu: Add python-pyproj. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 06:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50812@debbugs.gnu.org Cc: Guillaume Le Vaillant , Felix Gruber , Xinglu Chen , Maxime Devos Received: via spool by 50812-submit@debbugs.gnu.org id=B50812.16328109261336 (code B ref 50812); Tue, 28 Sep 2021 06:36:03 +0000 Received: (at 50812) by debbugs.gnu.org; 28 Sep 2021 06:35:26 +0000 Received: from localhost ([127.0.0.1]:43570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6i6-0000LT-I2 for submit@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:26 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6i5-0000Kz-F5 for 50812@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:25 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id CB254240104 for <50812@debbugs.gnu.org>; Tue, 28 Sep 2021 08:35:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632810919; bh=iM6aLVn5PhbvrAPhN6Ph4jalSavJxmOi7o1rvchSiq4=; h=From:To:Cc:Subject:Date:From; b=bpjHh7HOXMSlDzeB7X29VJCwEmN8zrHb9+YXRRCDMV7j3EJj2NqwfCcO/AguBHHh9 MrcAVzdAVlJvZSnLRnqO44tEPCsjKsU/cQfqpfQFlkx0/gsc4cNUP2UCcwhAigUp6f 0ch+iAUh1nK1jC1A+CitpBGm7+ozLUa8b5TzNMGy1frd8fIGYDiAeNuMz4MpU1psLr i4QagcwiiFHvoU2UvsX5wFU0MMP/D8llvgHH8PaiytWGSOaV8jkocLST9BJtl/+itJ lKdb2C4kSckRULMvAJdWt+e7Jj21kIDkQV/JE2NXJfBE+wt0wEEpXVJzUt8RzCT4OM uCHmTQihExcIQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJV9y5xcNz9rxD; Tue, 28 Sep 2021 08:35:18 +0200 (CEST) From: Felix Gruber Date: Tue, 28 Sep 2021 06:34:41 +0000 Message-Id: <20210928063444.466158-3-felgru@posteo.net> In-Reply-To: <20210928063444.466158-1-felgru@posteo.net> References: <20210926085219.13547-1-felgru@posteo.net> <20210928063444.466158-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-pyproj): New variable. --- gnu/packages/geo.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ec45601ef4..6fdf71c4e3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -93,6 +93,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -600,6 +601,46 @@ projections.") ;; cmake/* license:boost1.0)))) +(define-public python-pyproj + (package + (name "python-pyproj") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyproj" version)) + (sha256 + (base32 + "0xrqpy708qlyd7nqjra0dl7nvkqzaj9w0v7wq4j5pxazha9n14sa")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-proj-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((proj (assoc-ref inputs "proj"))) + (setenv "PROJ_DIR" proj) + (substitute* "pyproj/datadir.py" + (("(internal_datadir = ).*$" all var) + (string-append var "Path(\"" proj "/share/proj\")\n"))))))))) + (inputs + `(("proj" ,proj))) + (propagated-inputs + `(("python-certifi" ,python-certifi))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-pytest" ,python-pytest) + ("python-xarray" ,python-xarray))) + (home-page "https://github.com/pyproj4/pyproj") + (synopsis + "Python interface to PROJ") + (description + "This package provides a Python interface to PROJ, a cartographic +projections and coordinate transformations library.") + (license license:expat))) + (define-public mapnik (package (name "mapnik") From patchwork Tue Sep 28 06:34:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 33383 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 6B70627BBE3; Tue, 28 Sep 2021 07:36:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1ADCC27BBE1 for ; Tue, 28 Sep 2021 07:36:29 +0100 (BST) Received: from localhost ([::1]:50906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV6j6-0003Ws-3f for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 02:36:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV6ii-0003Ue-Jh for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV6ih-0007lC-O0 for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mV6ih-0000NP-Kw for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50812] [PATCH v4 3/5] gnu: Add python-cligj. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 06:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50812@debbugs.gnu.org Cc: Guillaume Le Vaillant , Felix Gruber , Xinglu Chen , Maxime Devos Received: via spool by 50812-submit@debbugs.gnu.org id=B50812.16328109311353 (code B ref 50812); Tue, 28 Sep 2021 06:36:03 +0000 Received: (at 50812) by debbugs.gnu.org; 28 Sep 2021 06:35:31 +0000 Received: from localhost ([127.0.0.1]:43574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6iA-0000Ll-QG for submit@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:31 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6i8-0000LK-4a for 50812@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:28 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 8BFD3240029 for <50812@debbugs.gnu.org>; Tue, 28 Sep 2021 08:35:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632810922; bh=NYtraHlsmDx1nxjmk6GYv4pYZHMujP491yyJ5hBr53E=; h=From:To:Cc:Subject:Date:From; b=OaY9SdSMtsdGUVLmgl9HKq+2fqWtvv3evd5GzBeFLShl6q84pj/Gp4K5AsSXVfFl5 7+7JZjLv87vmXKMHxhmSEm1dWYnCAWcYfaRkJecutc/LRr3rEtksbmmeufES3R+XO5 Td74X8z2rLgz+kWFV3Lq4g/EIYSzcvajmPd4GDxsb0JtCdJqMDJdFepyL/RzbLmy4k GUcSW9tWb+ydE4mWi5JGdzpdlgJ9tnmTuVMKHCXE+10hiQuDB5oyPnvrLNwUXv6qaP qR8vToUo8t/OPw6fc+B/BMVg1wtU9f15GgfdUTp4aH2wUnLJj0ZbVneT3CMUhuBrGe qIOmCjmytdEjw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJVB16T6gz6tm5; Tue, 28 Sep 2021 08:35:21 +0200 (CEST) From: Felix Gruber Date: Tue, 28 Sep 2021 06:34:42 +0000 Message-Id: <20210928063444.466158-4-felgru@posteo.net> In-Reply-To: <20210928063444.466158-1-felgru@posteo.net> References: <20210926085219.13547-1-felgru@posteo.net> <20210928063444.466158-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/python-xyz.scm (python-cligj): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 86b1cdc2b1..91740cd0f4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -108,6 +108,7 @@ ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Daniel Meißner ;;; Copyright © 2021 Pradana Aumars +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -3308,6 +3309,31 @@ with sensible defaults out of the box.") (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337")))) (arguments `()))) +(define-public python-cligj + (package + (name "python-cligj") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cligj" version)) + (sha256 + (base32 + "09vbkik6kyn6yrqzl2r74vaybjk8kjykvi975hy3fsrm4gb17g54")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click))) + (native-inputs + `(("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://github.com/mapbox/cligj") + (synopsis + "Click params for commmand line interfaces to GeoJSON") + (description + "cligj is for Python developers who create command line interfaces +for geospatial data. cligj allows you to quickly build consistent, +well-tested and interoperable CLIs for handling GeoJSON.") + (license license:bsd-3))) + (define-public python-vcversioner (package (name "python-vcversioner") From patchwork Tue Sep 28 06:34:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 33384 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 A44BE27BBE3; Tue, 28 Sep 2021 07:36:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5E87227BBE1 for ; Tue, 28 Sep 2021 07:36:31 +0100 (BST) Received: from localhost ([::1]:51076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV6j8-0003ef-Dn for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 02:36:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV6ii-0003Uf-KJ for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60274) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV6ii-0007lX-4M for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mV6ii-0000NX-1i for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50812] [PATCH v4 4/5] gnu: Add python-fiona. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 06:36:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50812@debbugs.gnu.org Cc: Guillaume Le Vaillant , Felix Gruber , Xinglu Chen , Maxime Devos Received: via spool by 50812-submit@debbugs.gnu.org id=B50812.16328109371380 (code B ref 50812); Tue, 28 Sep 2021 06:36:04 +0000 Received: (at 50812) by debbugs.gnu.org; 28 Sep 2021 06:35:37 +0000 Received: from localhost ([127.0.0.1]:43580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6iH-0000MA-2J for submit@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:37 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6iB-0000LU-P5 for 50812@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:32 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 34B05240027 for <50812@debbugs.gnu.org>; Tue, 28 Sep 2021 08:35:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632810926; bh=gQCp+IL2sHvcBEd7oYoBRvPuywnsjMxG7+FQuj/R3DM=; h=From:To:Cc:Subject:Date:From; b=mchUMt4lYXs+ESjWfcEjh+/UIte9IXcaoIzW0Xg5ASDOk3r4nxfVTUJKx1wzcW8o4 dlUBvMywDnykwEpjuykNjFq90/1WMtQVMQzuAVDdkCtVzle2ZF1tBhTS13mYfXPeEB wXwci6mDWl1TxcE5CUcQi39czjCgxLCdqFGfXfLBIrSaRP6EjMgyBfkZJMe4fsuZ3l NJdMlJjVGfe43LsNMgwk/teEoZMUc4ahY5bp6inDA+RIU2QYfL1Zjz8WPjx1iLZ2Ho tKdcgNnk4foQ7jJrxqQ7GRUF7j4ZjvElaR+McqSmfrYwSWkXwTKZLHCPfTM17Ix8MB AU7aRauRw1kLA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJVB53X4mz9rxL; Tue, 28 Sep 2021 08:35:25 +0200 (CEST) From: Felix Gruber Date: Tue, 28 Sep 2021 06:34:43 +0000 Message-Id: <20210928063444.466158-5-felgru@posteo.net> In-Reply-To: <20210928063444.466158-1-felgru@posteo.net> References: <20210926085219.13547-1-felgru@posteo.net> <20210928063444.466158-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-fiona): New variable. --- gnu/packages/geo.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 6fdf71c4e3..4329ee118e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -641,6 +641,63 @@ projections.") projections and coordinate transformations library.") (license license:expat))) +(define-public python-fiona + (package + (name "python-fiona") + (version "1.8.20") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Fiona" version)) + (sha256 + (base32 + "0fql7i7dg1xpbadmk8d26dwp91v7faixxc4wq14zg0kvhp9041d7")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'remove-local-fiona + (lambda _ + ; This would otherwise interfere with finding the installed + ; fiona when running tests. + (delete-file-recursively "fiona"))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (when tests? + (invoke "pytest" "-m" "not network and not wheel"))))))) + (inputs + `(("gdal" ,gdal))) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ("python-certifi" ,python-certifi) + ("python-click" ,python-click) + ("python-click-plugins" ,python-click-plugins) + ("python-cligj" ,python-cligj) + ("python-munch" ,python-munch) + ("python-setuptools" ,python-setuptools) + ("python-six" ,python-six) + ("python-pytz" ,python-pytz))) + (native-inputs + `(("gdal" ,gdal) ; for gdal-config + ("python-boto3" ,python-boto3) + ("python-cython" ,python-cython) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://github.com/Toblerity/Fiona") + (synopsis + "Fiona reads and writes spatial data files") + (description + "Fiona is GDAL’s neat and nimble vector API for Python programmers. +Fiona is designed to be simple and dependable. It focuses on reading +and writing data in standard Python IO style and relies upon familiar +Python types and protocols such as files, dictionaries, mappings, and +iterators instead of classes specific to OGR. Fiona can read and write +real-world data using multi-layered GIS formats and zipped virtual file +systems and integrates readily with other Python GIS packages such as +pyproj, Rtree, and Shapely.") + (license license:bsd-3))) + (define-public mapnik (package (name "mapnik") From patchwork Tue Sep 28 06:34:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 33387 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 9EC3927BBE3; Tue, 28 Sep 2021 07:36:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 63CEA27BBE1 for ; Tue, 28 Sep 2021 07:36:49 +0100 (BST) Received: from localhost ([::1]:52302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mV6jQ-0004UJ-He for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 02:36:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mV6ii-0003V2-PP for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60275) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mV6ii-0007lf-GO for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mV6ii-0000Ne-Dt for guix-patches@gnu.org; Tue, 28 Sep 2021 02:36:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50812] [PATCH v4 5/5] gnu: Add python-geopandas. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 06:36:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50812@debbugs.gnu.org Cc: Guillaume Le Vaillant , Felix Gruber , Xinglu Chen , Maxime Devos Received: via spool by 50812-submit@debbugs.gnu.org id=B50812.16328109381386 (code B ref 50812); Tue, 28 Sep 2021 06:36:04 +0000 Received: (at 50812) by debbugs.gnu.org; 28 Sep 2021 06:35:38 +0000 Received: from localhost ([127.0.0.1]:43582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6iH-0000MD-BS for submit@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mV6iF-0000Lj-Ie for 50812@debbugs.gnu.org; Tue, 28 Sep 2021 02:35:35 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DEC46240107 for <50812@debbugs.gnu.org>; Tue, 28 Sep 2021 08:35:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632810929; bh=7fie50/AH8eRE4fwzr6ZuYmlnAZ40vBdHrh51WT7Giw=; h=From:To:Cc:Subject:Date:From; b=W8/0E5NWdAFUFWYKXVItMWtZD6EL2Sq4we1DzuJFRVgDy79M5ff6E6e0Spee3y3/y TbAMO/rU6OHXmv3Tg9qGn67Ztwk+Y4cGGXiUEm8JyjU2kaDDvbZU/NJ/Dz3k/CymUq /JkmOCNU/CInoukeWPlVJJwF8OwX7YlYX+e6yHmVg1USTUaOc+BnmNfM+SxnOXwDbi 43/QZSydEwkaYKPqLov+WQci+lIFuUBcdj/gxbRM+URL+f1fls9wdR0MHvzoBE142x aJn+QPp1eO/R531Es5ScFCntOABrDM81EucylqYUiu20I1SKeRelK+LgzbZjFNln4+ AFpeAt7Lu8aTw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJVB86wGjz9rxD; Tue, 28 Sep 2021 08:35:28 +0200 (CEST) From: Felix Gruber Date: Tue, 28 Sep 2021 06:34:44 +0000 Message-Id: <20210928063444.466158-6-felgru@posteo.net> In-Reply-To: <20210928063444.466158-1-felgru@posteo.net> References: <20210926085219.13547-1-felgru@posteo.net> <20210928063444.466158-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-geopandas): New variable. --- gnu/packages/geo.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4329ee118e..329ba0a9f9 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -698,6 +698,47 @@ systems and integrates readily with other Python GIS packages such as pyproj, Rtree, and Shapely.") (license license:bsd-3))) +(define-public python-geopandas + (package + (name "python-geopandas") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "geopandas" version)) + (sha256 + (base32 + "02k389zyyjv51gd09c92vlr83sv46awdq0066jgh5i24vjs2m5v3")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" + ; Disable test that fails with + ; NotImplementedError in pandas. + "-k" "not test_fillna_no_op_returns_copy" + ; Disable tests that require internet access. + "-m" "not web"))))))) + (propagated-inputs + `(("python-fiona" ,python-fiona) + ("python-pandas" ,python-pandas) + ("python-pyproj" ,python-pyproj) + ("python-shapely" ,python-shapely))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "http://geopandas.org") + (synopsis "Geographic pandas extensions") + (description "The goal of GeoPandas is to make working with +geospatial data in Python easier. It combines the capabilities of +Pandas and Shapely, providing geospatial operations in Pandas and a +high-level interface to multiple geometries to Shapely. GeoPandas +enables you to easily do operations in Python that would otherwise +require a spatial database such as PostGIS.") + (license license:bsd-3))) + (define-public mapnik (package (name "mapnik")