From patchwork Sun Feb 4 16:47:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 59783 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 DC40527BBEA; Sun, 4 Feb 2024 16:49:02 +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 6B20027BBE9 for ; Sun, 4 Feb 2024 16:49:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWffo-0002a8-Qd; Sun, 04 Feb 2024 11:48:52 -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 1rWffn-0002Zh-BE for guix-patches@gnu.org; Sun, 04 Feb 2024 11:48:51 -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 1rWffn-0005do-3F for guix-patches@gnu.org; Sun, 04 Feb 2024 11:48:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWffy-0008Kb-UW; Sun, 04 Feb 2024 11:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68925] [PATCH 2/8] gnu: python-pyproj: Update to 3.6.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 16:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68925 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68925@debbugs.gnu.org Cc: Felix Gruber , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 68925-submit@debbugs.gnu.org id=B68925.170706533131938 (code B ref 68925); Sun, 04 Feb 2024 16:49:02 +0000 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:48:51 +0000 Received: from localhost ([127.0.0.1]:49910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffm-0008J3-L2 for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:50 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffk-0008I7-Sp for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:49 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 371A4240028 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065311; bh=c8g6+wbePDyCCIUrlt+CTI+1DnMrjQrXQA8cczG9aGE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=OV0jwy/XmQx78xPG2c2/h7kEK9uDjolCUS/yTj5cG5lESE3wJTmJQbydwYYV4f16I tg/Kcs7TIcOo82/E1xB4z9G4WJXf+KXJbPDejc4e35U15OBHbRBnEdb1nDhoa6w1R5 nJhjaun7R2u1z5MC7FuyGVlmSN/JqiJj/VTNpyCRgZfDYjBNp7IMAz+XKzasi8gYtA MYhOOxE6KaDXtZojNEidRErbEijak5S8cSqvHJljydE+HzRK5E64ibPHYr/8WOIbn5 SnuRyrFT4A4mSzd9RMjUSfEdtseE9BucAbrjAjOCGW6Q9eQJ0z6NicYUzMipC+G3yZ +WhhAfVaQH2IA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb725Bxjz9rxD; Sun, 4 Feb 2024 17:48:30 +0100 (CET) From: Felix Gruber Date: Sun, 4 Feb 2024 16:47:12 +0000 Message-ID: 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 * gnu/packages/geo.scm (python-pyproj): Update to 3.6.1. [arguments]: Convert to gexp. Change-Id: I0ef2bf3da8d35b728f4ba4009caca33fa18dbad3 --- gnu/packages/geo.scm | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4d76095d67..5882271174 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -844,31 +844,36 @@ (define-public proj.4 (define-public python-pyproj (package (name "python-pyproj") - (version "3.5.0") + (version "3.6.1") (source (origin (method url-fetch) (uri (pypi-uri "pyproj" version)) (sha256 (base32 - "1xhvr0n5gb7v6x0wd7cqmc0zrky2fag7bq2shx6l2qqq3icx2ncq")))) + "1gq1spm5zdq9k8kl9cb31b9m08ybyrdggfw3sjrqyz9b9iq7raj4")))) (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"))))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-proj-path + (lambda* (#:key #:allow-other-keys) + (let ((proj #$(this-package-input "proj"))) + (setenv "PROJ_DIR" proj) + (substitute* "pyproj/datadir.py" + (("(internal_datadir = ).*$" all var) + (string-append var "Path(\"" proj + "/share/proj\")\n"))))))))) (inputs (list proj)) (propagated-inputs (list python-certifi)) (native-inputs - (list python-cython python-numpy python-pandas python-pytest + (list python-cython + python-numpy + python-pandas + python-pytest python-xarray)) (home-page "https://github.com/pyproj4/pyproj") (synopsis