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")