From patchwork Fri Jun 9 14:58:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 50790 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 1A08427BBE9; Fri, 9 Jun 2023 16:01:30 +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 E070A27BBE2 for ; Fri, 9 Jun 2023 16:01:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7dc0-0005CN-Uc; Fri, 09 Jun 2023 11:01:13 -0400 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 1q7dbq-00058u-QV for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7dbq-0002iy-73 for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7dbq-0004gf-1V for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49207] [PATCH v2 1/5] gnu: Add python-imagehash. References: In-Reply-To: Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jun 2023 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49207@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 49207-submit@debbugs.gnu.org id=B49207.168632280817899 (code B ref 49207); Fri, 09 Jun 2023 15:01:02 +0000 Received: (at 49207) by debbugs.gnu.org; 9 Jun 2023 15:00:08 +0000 Received: from localhost ([127.0.0.1]:60034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7day-0004ed-Av for submit@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:08 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7dav-0004cP-0r for 49207@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:07 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 34B3D240029 for <49207@debbugs.gnu.org>; Fri, 9 Jun 2023 16:59:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1686322799; bh=+8A7oU0EnzG0PrAHc4m3G6BEe44O/k4kPW5dpxD27RY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=hgDV0KAYT5U264d+N7wDe1JDsCIrzrJsyGcyjwaGFglp9AuhloE4gf6Wxto7qZi84 LHuFrvORqJ9ZEV2eHF/lmo7GoATWCEHwsVT6+zUJG46NiLP5QEIjGNQDoQv/luxQCe W3sqkfGWsuesosYaa/67sjI9AYajG73mv+Ls4xwVX/p910Gey6c1l1TwFs2jBlqCv8 riaBF7aKySHxz/oSI0bMryMUqCBSI1Pc5sXVO1u2HiZq/t64nHHitlLSQgiCGgQeUu DAx3qspSv97oOJ/tZwuAdDRfol7wQzjbq2CtW/qBce/pfkqgj2QRBpD39+9NUIj4TQ 9mS/eOm6knteA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qd44X4M8tz9rxK; Fri, 9 Jun 2023 16:59:56 +0200 (CEST) From: Vinicius Monego Date: Fri, 9 Jun 2023 14:58:50 +0000 Message-Id: <20230609145854.2581045-1-monego@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/digest.scm (python-imagehash): New variable. --- gnu/packages/digest.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index 481771804b..405c1769d3 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2021 Ryan Prior ;;; Copyright © 2021, 2022 Ricardo Wurmus +;;; Copyright © 2023 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,10 @@ (define-module (gnu packages digest) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix utils) + #:use-module (gnu packages check) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-science) + #:use-module (gnu packages python-xyz) #:use-module (ice-9 match)) (define-public wyhash @@ -129,3 +133,34 @@ (define-public python-xxhash (description "This package provides Python bindings for the xxHash hash algorithm.") (license license:bsd-3))) + +(define-public python-imagehash + (package + (name "python-imagehash") + (version "4.3.1") + (source + (origin + (method git-fetch) ;no tests in PyPI + (uri (git-reference + (url "https://github.com/JohannesBuchner/imagehash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lw9lxzrzy9s5v3xc35vmh97hlyavnla087fp19k77va6v8vbjjf")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest)) + (propagated-inputs (list python-numpy python-pillow python-pywavelets + python-scipy)) + (home-page "https://github.com/JohannesBuchner/imagehash") + (synopsis "Image hashing library") + (description "ImageHash is an image hashing library. It supports: + +@itemize +@item Average hashing +@item Perceptual hashing +@item Difference hashing +@item Wavelet hashing +@item HSV color hashing (colorhash) +@item Crop-resistant hashing +@end itemize") + (license license:bsd-2))) From patchwork Fri Jun 9 14:58:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 50791 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 B8AA627BBE9; Fri, 9 Jun 2023 16:01:35 +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 13DB827BBE2 for ; Fri, 9 Jun 2023 16:01:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7dbt-0005CA-SS; Fri, 09 Jun 2023 11:01:05 -0400 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 1q7dbq-000597-V7 for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7dbq-0002j8-MR for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7dbq-0004gm-HM for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49207] [PATCH v2 2/5] gnu: Add python-cf-units. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jun 2023 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49207@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 49207-submit@debbugs.gnu.org id=B49207.168632282017929 (code B ref 49207); Fri, 09 Jun 2023 15:01:02 +0000 Received: (at 49207) by debbugs.gnu.org; 9 Jun 2023 15:00:20 +0000 Received: from localhost ([127.0.0.1]:60037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7db9-0004f7-Q7 for submit@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:20 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7db7-0004es-UF for 49207@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:18 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 670AC240027 for <49207@debbugs.gnu.org>; Fri, 9 Jun 2023 17:00:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1686322812; bh=7316bl9rbwbwNphDa7i2ZUEuUfXYHiebnQ3vTDRhvyc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=RnBhJ895kyU5r/0JUAka5DRGBe9Hb0OvaBUBj1cCfBo/WLCOlb/TlKfrrTkhJH8O2 EZ7dWIrkP8bQ3bifw8GSyckuRoRi+0ttOH/qdIfQp1eix/LbRE7NaAqnMyVg8EFBhK Gdv3FogENJBgIdIPaFErbw0m9uMBBLxlz4J1TACzfZ8gN8jE3HQFpfGUm+j9nvFBhl Vg5gkMJuOefASxr3wOx35x0bkYrqYwe6hMEnLqO9QFqfuTiMZFt9LEWLOnWq11tvT6 YbbvmiHdkpV6Py1HUqICDxXEs/md3llI6045Cm6zl4R/mkO8RVQyOdNzwPdrJN+fOk 9J5B+uhD91/Hg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qd44m3HMTz9rxR; Fri, 9 Jun 2023 17:00:06 +0200 (CEST) From: Vinicius Monego Date: Fri, 9 Jun 2023 14:58:51 +0000 Message-Id: <20230609145854.2581045-2-monego@posteo.net> In-Reply-To: <20230609145854.2581045-1-monego@posteo.net> References: <20230609145854.2581045-1-monego@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (python-cf-units): New variable. --- gnu/packages/geo.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 25805fe2e5..2c15df18cc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1380,6 +1380,52 @@ (define-public postgis ;; doc license:cc-by-sa3.0)))) +(define-public python-cf-units + (package + (name "python-cf-units") + (version "3.2.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "cf-units" version)) + (sha256 + (base32 + "0kq76p13ndm8033m0jfbfryhlk3c0iwy1d92sg1f8zqmwi0g3ac8")))) + (build-system pyproject-build-system) + (arguments + ;; FIXME: 'ImportError: cannot import name '_udunits2' from partially + ;; initialized module 'cf_units' (most likely due to a circular import)'. + ;; Importing works after the package is built. + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'udunits-path + (lambda _ + (setenv "UDUNITS2_XML_PATH" + (string-append + #$(this-package-input "udunits") + "/share/udunits/udunits2.xml")))) + ;; cf-units has a hard dependency on antlr4 4.7.2 and + ;; doesn't work with newer versions. Upstream is trying + ;; to change it or make antlr4 optional, see + ;; https://github.com/SciTools/cf-units/issues/313 + (delete 'sanity-check)))) + (propagated-inputs (list java-antlr4-runtime-python + python-cftime + python-jinja2 + python-numpy)) + (inputs (list udunits)) + (native-inputs (list python-codecov + python-cython + python-jinja2 + python-pytest + python-pytest-cov + python-setuptools-scm)) + (home-page "https://github.com/SciTools/cf-units") + (synopsis "Units of measure as required by the CF metadata conventions") + (description "This package provids units of measure as required by the + Climate and Forecast (CF) metadata conventions.") + (license license:lgpl3+))) + (define-public tegola (package (name "tegola") From patchwork Fri Jun 9 14:58:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 50793 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 F2E8527BBEA; Fri, 9 Jun 2023 16:01:50 +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,TVD_SPACE_RATIO, 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 9576D27BBE2 for ; Fri, 9 Jun 2023 16:01:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7dc2-0005Fd-Bc; Fri, 09 Jun 2023 11:01:14 -0400 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 1q7dbs-0005AN-VX for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7dbr-0002jG-3e for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7dbq-0004gv-VI for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49207] [PATCH v2 3/5] gnu: python-dask: Propagate python-importlib-metadata. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jun 2023 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49207@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 49207-submit@debbugs.gnu.org id=B49207.168632282617952 (code B ref 49207); Fri, 09 Jun 2023 15:01:02 +0000 Received: (at 49207) by debbugs.gnu.org; 9 Jun 2023 15:00:26 +0000 Received: from localhost ([127.0.0.1]:60040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7dbG-0004fT-65 for submit@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:26 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7dbE-0004f5-ET for 49207@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E4B6D240028 for <49207@debbugs.gnu.org>; Fri, 9 Jun 2023 17:00:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1686322818; bh=0NIKZCOyT2ZF+vczjaEr1Eun8kZgjl4zz9IpYM2TlL8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=fhYYebsnK9tq3eBvsRj3j8NV6v7LFcEFDLgxmQ+Lf0AoVNG2ksoBaHVizmjqlYC5r HgT1wBoBVsHOiR5qAbGbAWh7ulndUuh11wX+Pp5ghzK2tFyOHPSi9dEWfZ/7Q6JP9N ViTg5i27pauDSmMoXRrZxggXEyTLRVqio6LOYjsos+8zVYXcxUiAQHCObV1t7gvD/d BxTGfJziYsinqUtdi3B2r9k0+rvJeIY1ry4AbEFIfsXX1+fSaRqgjEf/rfQ3IGRxJn ig9RyKHblRUEgS1CJGkUs9YDZIdTmb9+JaMLWN9XU0dgJEUoAqgxgYYkbeaf/0U4vR ER8ETZgRjAPEg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qd44x6tw2z9rxG; Fri, 9 Jun 2023 17:00:17 +0200 (CEST) From: Vinicius Monego Date: Fri, 9 Jun 2023 14:58:52 +0000 Message-Id: <20230609145854.2581045-3-monego@posteo.net> In-Reply-To: <20230609145854.2581045-1-monego@posteo.net> References: <20230609145854.2581045-1-monego@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-dask)[native-inputs]: Move python-importlib-metadata to... [propagated-inputs]: ...here. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9036246bfb..7d5128911f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25146,6 +25146,7 @@ (define-public python-dask (propagated-inputs (list python-cloudpickle python-fsspec + python-importlib-metadata python-numpy python-packaging python-pandas @@ -25154,7 +25155,6 @@ (define-public python-dask python-pyyaml)) (native-inputs (list python-click - python-importlib-metadata python-pytest python-pytest-runner python-pytest-rerunfailures python-versioneer)) (home-page "https://github.com/dask/dask/") From patchwork Fri Jun 9 14:58:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 50792 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 9379F27BBEA; Fri, 9 Jun 2023 16:01:47 +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=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 1F29A27BBE9 for ; Fri, 9 Jun 2023 16:01:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7dc2-0005Fe-D1; Fri, 09 Jun 2023 11:01:14 -0400 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 1q7dbs-0005AM-VB for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7dbr-0002jI-IE for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7dbr-0004h2-Cm for guix-patches@gnu.org; Fri, 09 Jun 2023 11:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49207] [PATCH v2 4/5] gnu: python-cartopy: Add dependencies. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jun 2023 15:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49207@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 49207-submit@debbugs.gnu.org id=B49207.168632285517996 (code B ref 49207); Fri, 09 Jun 2023 15:01:03 +0000 Received: (at 49207) by debbugs.gnu.org; 9 Jun 2023 15:00:55 +0000 Received: from localhost ([127.0.0.1]:60043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7dbj-0004gC-HB for submit@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:55 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7dbi-0004fy-B6 for 49207@debbugs.gnu.org; Fri, 09 Jun 2023 11:00:54 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id CDA3E240027 for <49207@debbugs.gnu.org>; Fri, 9 Jun 2023 17:00:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1686322848; bh=Aa5wJxOTuHCPcXdX1ExZ9QfLCTx8qN78tvk22oXwbU0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=oJYoAXltpOXQowdcyJYi2OaPfmfTdgbjo/EquzSf8XIXxYr0X5EValkra5Q22QBpj 094V97HfqMMXNuvXgc8+JNkUQZh+i3Ylw3qd4mrTBmuXe1qjf2sjh08mLoAqiEBtyM HN2IJh4dQuaMZnLwM3LCFwkfI0GSDU3eoaHdf5mvCnFtx/SjWpOBG0CtyXIyeYksA2 RFR+xNujZsLDHWRt/jcol/xrnWjgZgiFbGSXIaA5A0rdVatCR0vj3eK65Tg4hUYy4W j6NXT/EqcHF+KvFC6hO+9GGogetDoYVnj8jn9kIoGcYp8lWtmKVjbpjnA7QsxcnQJJ aT7vmvZF8gJBg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qd45W0sFmz9rxF; Fri, 9 Jun 2023 17:00:46 +0200 (CEST) From: Vinicius Monego Date: Fri, 9 Jun 2023 14:58:53 +0000 Message-Id: <20230609145854.2581045-4-monego@posteo.net> In-Reply-To: <20230609145854.2581045-1-monego@posteo.net> References: <20230609145854.2581045-1-monego@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (python-cartopy)[native-inputs]: Add python-setuptools-scm, python-wheel. --- gnu/packages/geo.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 2c15df18cc..c1b028104c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1303,7 +1303,9 @@ (define-public python-cartopy (list python-cython python-flufl-lock python-pytest - python-pytest-mpl)) + python-pytest-mpl + python-setuptools-scm + python-wheel)) (home-page "https://scitools.org.uk/cartopy/docs/latest/") (synopsis "Cartographic library for visualisation") (description From patchwork Fri Jun 9 14:58:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 50794 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 78BFD27BBEA; Fri, 9 Jun 2023 16:02:17 +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=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 8851C27BBE2 for ; Fri, 9 Jun 2023 16:02:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7dcr-0005tu-7V; Fri, 09 Jun 2023 11:02:05 -0400 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 1q7dco-0005sY-7H for guix-patches@gnu.org; Fri, 09 Jun 2023 11:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7dcn-0002ye-UP for guix-patches@gnu.org; Fri, 09 Jun 2023 11:02:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7dcn-0004ic-OR for guix-patches@gnu.org; Fri, 09 Jun 2023 11:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49207] [PATCH v2 5/5] gnu: Add python-scitools-iris. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jun 2023 15:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49207@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 49207-submit@debbugs.gnu.org id=B49207.168632286518072 (code B ref 49207); Fri, 09 Jun 2023 15:02:01 +0000 Received: (at 49207) by debbugs.gnu.org; 9 Jun 2023 15:01:05 +0000 Received: from localhost ([127.0.0.1]:60050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7dbs-0004hP-Ta for submit@debbugs.gnu.org; Fri, 09 Jun 2023 11:01:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7dbq-0004gK-46 for 49207@debbugs.gnu.org; Fri, 09 Jun 2023 11:01:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 5AE1A240101 for <49207@debbugs.gnu.org>; Fri, 9 Jun 2023 17:00:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1686322856; bh=42Nk2Kma1UjG/eJ/DQucoT8gdU4yQgiBiqwBNqcOeNQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=Q3SQp2ZyUbYBC3GqPbJWGiDvVtnV9YowhnBnh5KuUV0wxpe0yGW/cFZ4kPwY1ld15 4hgrXpLGXWoX2fBWTbjdgS/fJWosJaB3iOhAGFwGUKovEgQf7bUD3VUzBaoSJh/SHW arnyfBExmWFTT5rVygaXh9aDJSKGUsTUcV1dU7ZY5FpwZtyPOfLCd2dwu/SPm36/ef h2fNuxU5/nmrlK3i1Fg2VZaYru+zH7HVasK+VhR9+K8HL5izSGDHgFlClzTFSsKVJl Q/omPG9RbtmG6r+4cNu1Gg7SHk/m7/yRFGZKKK5pZlUwkdtZXICRwpF0ZfDAnzmBy6 4RTayMudT2qCg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qd45f3Czxz9rxB; Fri, 9 Jun 2023 17:00:54 +0200 (CEST) From: Vinicius Monego Date: Fri, 9 Jun 2023 14:58:54 +0000 Message-Id: <20230609145854.2581045-5-monego@posteo.net> In-Reply-To: <20230609145854.2581045-1-monego@posteo.net> References: <20230609145854.2581045-1-monego@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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (python-scitools-iris): New variable. --- gnu/packages/geo.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c1b028104c..eb58781591 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -73,6 +73,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) + #:use-module (gnu packages digest) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -1428,6 +1429,74 @@ (define-public python-cf-units Climate and Forecast (CF) metadata conventions.") (license license:lgpl3+))) +(define-public python-scitools-iris + (package + (name "python-scitools-iris") + (version "3.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "scitools-iris" version)) + (sha256 + (base32 + "08r13aans17qgv93m0hwzwmiqvbgkn5rhp9r5szyv4i99xz62igj")))) + (build-system pyproject-build-system) + (arguments + ;; Tests below fail because of URL open errors and missing data (which is + ;; probably being downloaded). + (list #:test-flags + #~(list "--ignore" "lib/iris/tests/test_cf.py" + "--ignore" "lib/iris/tests/integration/netcdf/test_delayed_save.py" + "--ignore" "lib/iris/tests/integration/netcdf/test_thread_safety.py" + "--ignore" "lib/iris/tests/integration/plot/test_vector_plots.py" + "--ignore" "lib/iris/tests/unit/analysis/regrid/test__CurvilinearRegridder.py" + "-k" (string-append "not test_python_versions" + " and not test_2d_coords_contour" + " and not test_grouped_dim" + " and not test_ungrouped_dim")) + #:phases #~(modify-phases %standard-phases + (add-before 'check 'build-std-names + (lambda _ + ;; Need to build lib/iris/std_names.py before + ;; running the tests. + (invoke "python" "setup.py" "std_names") + ;; Replace some executable paths. + (let ((nc #$(this-package-native-input "netcdf"))) + (substitute* "lib/iris/tests/stock/netcdf.py" + (("env_bin_path\\(\"ncgen\"\\)") + (format #f "\"~a/bin/ncgen\"" nc))) + (substitute* "lib/iris/tests/__init__.py" + (("env_bin_path\\(\"ncdump\"\\)") + (format #f "\"~a/bin/ncdump\"" nc)))))) + ;; To avoid the antlr4 error from cf-units. + (delete 'sanity-check)))) + (native-inputs (list netcdf + python-click + python-filelock + python-imagehash + python-pytest + python-setuptools-scm + python-wheel)) + (propagated-inputs (list python-cartopy + python-cf-units + python-cftime + python-dask + python-distributed + python-matplotlib + python-netcdf4 + python-numpy + python-pyproj + python-scipy + python-shapely + python-xxhash)) + (home-page "https://github.com/SciTools/iris") + (synopsis "Library for analysing and visualising Earth science data") + (description + "Iris is a Python library for analysing and visualising Earth ++science data. It excels when working with multi-dimensional Earth Science ++data, where tabular representations become unwieldy and inefficient. Iris ++implements a data model based on the CF conventions.") + (license license:lgpl3+))) + (define-public tegola (package (name "tegola")