From patchwork Fri Jan 26 01:26:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59409 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 0721C27BBEA; Fri, 26 Jan 2024 01:27: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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 B522427BBE2 for ; Fri, 26 Jan 2024 01:27:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTAzj-0004IZ-0j; Thu, 25 Jan 2024 20:26:59 -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 1rTAzh-0004I3-EF for guix-patches@gnu.org; Thu, 25 Jan 2024 20:26:57 -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 1rTAzh-0006rs-5n for guix-patches@gnu.org; Thu, 25 Jan 2024 20:26:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTAzm-0002uE-2B; Thu, 25 Jan 2024 20:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59938] [PATCH 1/1] gnu: Add python-ogr2osm. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 26 Jan 2024 01:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59938@debbugs.gnu.org Cc: Sharlatan Hellseher , Patrick Noll , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 59938-submit@debbugs.gnu.org id=B59938.170623240911145 (code B ref 59938); Fri, 26 Jan 2024 01:27:02 +0000 Received: (at 59938) by debbugs.gnu.org; 26 Jan 2024 01:26:49 +0000 Received: from localhost ([127.0.0.1]:49728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTAzZ-0002th-2J for submit@debbugs.gnu.org; Thu, 25 Jan 2024 20:26:49 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTAzV-0002tS-Vq for 59938@debbugs.gnu.org; Thu, 25 Jan 2024 20:26:47 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-337b8da1f49so6465489f8f.0 for <59938@debbugs.gnu.org>; Thu, 25 Jan 2024 17:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706232394; x=1706837194; 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=aFE7RZBTKmyVRcCM7uPcJV3+M25/zTV+tkXGhN7o5nA=; b=GJnqqvjxN0VdQAyjfMPFrxet6Jmjphwx1f6woEgsFQXQu4Byi/6pl1vfA4PUDu1voC UZMD7Y0zvQ0putRG593S8w8rxkH4pDrgIcp28otTEHOqA5uu/jyWhKVuEHLqvowWZqts qXfe1VIiOAbEIsMPidFRgh4PiPtywVEG0zf1lhqfkzYQZ/HnOGBn3n3vgPljWtnQEZfb IDyMavd+xPfVv9/Np5/FNmxOuWXwsiR8jlW65GMYyXG47sSQqX64EcVyAl75+LuAWPLq EkuLKR00xsTFMYEilonavGdJ1tHSNsq8FNfOe5BxS35DHhn77YfaFbGYzdPSMsvJDRw3 6xmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706232394; x=1706837194; 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=aFE7RZBTKmyVRcCM7uPcJV3+M25/zTV+tkXGhN7o5nA=; b=VvJzBxfFu7YCmW6byuuGT5/8aRDGuX2d7r7nMJk8Qg6aBoiH9VhBWS1B+V0v23/uvi zheraWn98qM066nDHR+I4LersNuIU/lY3rskEDRW3XhMUGgy6R5UJfo/P5PDjW/wMoFa AOAd2W+UCdZMKetLpFg2uJg/f4VyfTIVi//h/giFOdT+GzeCNCRZF3XgZjFsnq4PVoW1 9SsYzVOrdO3rVvLDh2+Cz4SzI6AGmL944bCtZ0IBHGtJl6JrZDMIX/ESck3rI5z6VJAZ /+l2yUExzS/nJnzsCMLg7Kf21jIszsVCrl6zIwr/04olIXRRKFixMaDNOrXljeoSChMt R9OQ== X-Gm-Message-State: AOJu0YzWcE3oUtXBpWymXrAHO+1VEro3bMmcw1AA52470aQqoP6L7IB3 3fy6fGCj6F0B3oSEMsCs7PbAdUpEhfEOFLFcUxNjanPrjXVTxIrf1rslINIUtxQ= X-Google-Smtp-Source: AGHT+IGfhQINdqrX+CRTn/cQQmwDex5ICUM91ci7MZV5nRNp82h2t7/umVB4nvyunSWALGf6tny7/A== X-Received: by 2002:a5d:6e87:0:b0:337:6d95:da5d with SMTP id k7-20020a5d6e87000000b003376d95da5dmr273526wrz.90.1706232393730; Thu, 25 Jan 2024 17:26:33 -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 ce3-20020a5d5e03000000b0033931b609ddsm117262wrb.43.2024.01.25.17.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 17:26:33 -0800 (PST) From: Sharlatan Hellseher Date: Fri, 26 Jan 2024 01:26:30 +0000 Message-ID: <9a6a717bbf93c1da003a4886ccd7103f4abd7433.1706232187.git.sharlatanus@gmail.com> 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 From: Patrick Noll * gnu/packages/geo.scm (python-ogr2osm): New variable. Co-authored-by: Sharlatan Hellseher Change-Id: Id083d89dd05a9e1cdeca500daff5fab872fa15b4 --- gnu/packages/geo.scm | 59 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 119a9802d0..5ec1f6ce77 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -14,10 +14,11 @@ ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2020 Christopher Baines ;;; Copyright © 2020, 2021, 2022, 2023 Felix Gruber -;;; Copyright © 2021, 2023 Sharlatan Hellseher +;;; Copyright © 2021, 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2021, 2023, 2024 Vinicius Monego ;;; Copyright © 2021 Clément Lassieur ;;; Copyright © 2021, 2022 Nikolay Korotkiy +;;; Copyright © 2022 Patrick Noll ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Denis 'GNUtoo' Carikli @@ -61,6 +62,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -974,6 +976,61 @@ (define-public python-geopandas require a spatial database such as PostGIS.") (license license:bsd-3))) +(define-public python-ogr2osm + (package + (name "python-ogr2osm") + (version "1.2.0") + (source + (origin + (method git-fetch) ; no tests data in PyPi package + (uri + (git-reference + (url "https://github.com/roelderickx/ogr2osm/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hwqnx3cdqxmniydpj1v31kglq1xjsx41d8p10c9j4hg8kb43j80")))) + (build-system pyproject-build-system) + (arguments + (list + ;; There are tests in git checkout but non of the examples taken from + ;; GitHub Actions worked for me. Disabling them to be checked later + ;; . + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; TODO: Fix provided tests. + ;; (invoke "cram" "test/basic_usage.t") + ;; (invoke "cram" "test/osm_output.t") + ;; (invoke "cram" "test/pbf_output.t") + + ;; Run simple tests to ensure that the command is working. + (invoke "ogr2osm" "--help") + (invoke + "ogr2osm" "-f" "test/shapefiles/basic_geometries.kml"))))))) + (inputs + (list gdal)) + (native-inputs + (list coreutils + diffutils + libxml2 + python-cram + which)) + (propagated-inputs + (list python-lxml + python-protobuf)) + (home-page "https://github.com/roelderickx/ogr2osm") + (synopsis "Convert ogr-readable files like shapefiles into OSM or PDF formats") + (description + "@code{ogr2osm} is a tool for converting ogr-readable files into +@acronym{OSM, OpenStreetMap} format. It supports reading from OGR files like +shapefiles or PostgresSQL database and converts data into @code{osm} or +@code{osm.pbf} formats. A translation file can be used to manipulate the data +during conversion.") + (license license:expat))) + (define-public python-osmnx (package (name "python-osmnx")