From patchwork Fri May 5 10:26:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice BRENON X-Patchwork-Id: 49809 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 7DC1F27BBE9; Fri, 5 May 2023 11:27: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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 9D68627BBE2 for ; Fri, 5 May 2023 11:27:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puseV-0008N0-PU; Fri, 05 May 2023 06:27:03 -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 1puseU-0008Mr-9h for guix-patches@gnu.org; Fri, 05 May 2023 06:27: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 1puseU-0002fi-0k for guix-patches@gnu.org; Fri, 05 May 2023 06:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puseT-00014s-SB for guix-patches@gnu.org; Fri, 05 May 2023 06:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63295] [PATCH] Update csvkit to 1.1.1 Resent-From: Alice BRENON Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 May 2023 10:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63295 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63295@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16832824084121 (code B ref -1); Fri, 05 May 2023 10:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 May 2023 10:26:48 +0000 Received: from localhost ([127.0.0.1]:53186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puseF-00014O-Ku for submit@debbugs.gnu.org; Fri, 05 May 2023 06:26:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:50162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puseD-00014G-J8 for submit@debbugs.gnu.org; Fri, 05 May 2023 06:26:46 -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 1puseD-0008KE-7A for guix-patches@gnu.org; Fri, 05 May 2023 06:26:45 -0400 Received: from lxc-smtp2.ens-lyon.fr ([140.77.167.81]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puse9-0002Yr-5U for guix-patches@gnu.org; Fri, 05 May 2023 06:26:44 -0400 Received: from localhost (localhost [127.0.0.1]) by lxc-smtp2.ens-lyon.fr (Postfix) with ESMTP id C36CFE436F for ; Fri, 5 May 2023 12:26:36 +0200 (CEST) X-Virus-Scanned: by amavisd-new-2.11.0 (20160426) (Debian) at ens-lyon.fr Received: from lxc-smtp2.ens-lyon.fr ([127.0.0.1]) by localhost (lxc-smtp2.ens-lyon.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jyd9yTwosJJO for ; Fri, 5 May 2023 12:26:36 +0200 (CEST) Received: from localhost (unknown [78.194.167.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by lxc-smtp2.ens-lyon.fr (Postfix) with ESMTPSA id ACB1CE4218 for ; Fri, 5 May 2023 12:26:36 +0200 (CEST) Date: Fri, 5 May 2023 12:26:36 +0200 From: Alice BRENON Message-ID: <20230505122636.5ea65265@ens-lyon.fr> Organization: ENS de Lyon X-Mailer: Claws Mail 4.1.1 (GTK 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Received-SPF: pass client-ip=140.77.167.81; envelope-from=alice.brenon@ens-lyon.fr; helo=lxc-smtp2.ens-lyon.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hello guix, I use csvkit and noticed it broke after the upgrade to python 3.10 http://ci.guix.gnu.org/build/1263118/details Updating it and a couple dependencies fixed it so here's a patch. I also converted the `*-inputs` fields to new style while I was at it. The addition of `(gnu package base)` among dependencies is because of `python-agate` now wanting `glibc-locales` for one of its tests. I hate to have had to write the previous sentence because a `((gnu package base) #:select (glibc-locales))` would have carried exactly as much information and remained in the code where it could be useful in the future while this email will be long-forgotten when someone needs it. But the rest of the imports are implicit (don't want to break the convention) and someone recently argued again against explicit imports on the chan. I therefore merely point out another situation where implicit would have saved the day to be sure not to waste evidence, should the community want to weigh the benefits and drawbacks of each approach some day. Nice day to you all, Alice From cbe0fc9bd86fbddcaf2564c2389cca0894616563 Mon Sep 17 00:00:00 2001 Message-Id: From: Alice BRENON Date: Fri, 5 May 2023 12:03:58 +0200 Subject: [PATCH] gnu: csvkit: Update to 1.1.1. Update package and its dependencies, getting rid of collections errors due to python 3.10 in the process and converting inputs to new style. * gnu/packages/wireservice.scm (csvkit): Update to 1.1.1 * gnu/packages/wireservice.scm (python-leather): Update to 0.3.4 * gnu/packages/wireservice.scm (python-agate): Update to 1.7.1 * gnu/packages/wireservice.scm (python-agate-dbf): Update to 0.2.2 --- gnu/packages/wireservice.scm | 69 ++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm index d315bc2d74..0e7ec7607f 100644 --- a/gnu/packages/wireservice.scm +++ b/gnu/packages/wireservice.scm @@ -26,6 +26,7 @@ (define-module (gnu packages wireservice) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages python-web) @@ -65,7 +66,7 @@ (define-syntax-rule (wireservice-package extra-fields ...) (define-public python-leather (wireservice-package (name "python-leather") - (version "0.3.3") + (version "0.3.4") (source (origin (method git-fetch) (uri (git-reference @@ -74,15 +75,16 @@ (define-public python-leather (file-name (git-file-name name version)) (sha256 (base32 - "1ck3dplni99sv4s117cbm07ydwwjsrxkhdy19rnk0iglia1d4s5i")))) + "00cg4cidl15q1xv2pmxdkia5brig7x0xy9hwf2mlf9cq39bpj1w6")))) (native-inputs - `(("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ("python-csselect" ,python-cssselect) - ("python-lxml" ,python-lxml))) + (list python-nose + python-sphinx + python-sphinx-rtd-theme + python-cssselect + python-lxml + )) (propagated-inputs - `(("python-six" ,python-six))) + (list python-six)) (home-page "https://leather.rtfd.org") (synopsis "Python charting for 80% of humans") (description "Leather is a Python charting library for those who need @@ -91,7 +93,7 @@ (define-public python-leather (define-public python-agate (wireservice-package (name "python-agate") - (version "1.6.1") + (version "1.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -100,21 +102,26 @@ (define-public python-agate (file-name (git-file-name name version)) (sha256 (base32 - "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl")))) + "1wqyml7f70hr7zhgwvwqy4bdshlbcmp4jmyc5y12jyx10xp3sk7c")))) (native-inputs - `(("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ("python-csselect" ,python-cssselect) - ("python-lxml" ,python-lxml))) + (list glibc-locales + python-coverage + python-cssselect + python-lxml + python-nose + python-pyicu + python-pytest + python-pytest-cov + python-pytz + python-sphinx + python-sphinx-rtd-theme)) (propagated-inputs - `(("python-babel" ,python-babel) - ("python-isodate" ,python-isodate) - ("python-leather" ,python-leather) - ("python-parsedatetime" ,python-parsedatetime) - ("python-pytimeparse" ,python-pytimeparse) - ("python-six" ,python-six) - ("python-slugify" ,python-slugify))) + (list python-babel + python-isodate + python-leather + python-parsedatetime + python-pytimeparse + python-slugify)) (home-page "https://agate.rtfd.org") (synopsis "Data analysis library") (description "Agate is a Python data analysis library. It is an @@ -150,7 +157,7 @@ (define-public python-agate-sql (define-public python-agate-dbf (wireservice-package (name "python-agate-dbf") - (version "0.2.1") + (version "0.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -159,14 +166,14 @@ (define-public python-agate-dbf (file-name (git-file-name name version)) (sha256 (base32 - "1y49fi6pmm7gzhajvqmfpcca2sqnwj24fqnsvzwk7r1hg2iaa2gi")))) + "03l3qlyw7588jhjjsiy15valqlzs8gjai8f74v18zv2za0zjqbzl")))) (native-inputs - `(("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) + (list python-nose + python-sphinx + python-sphinx-rtd-theme)) (propagated-inputs - `(("python-agate" ,python-agate) - ("python-dbfread" ,python-dbfread))) + (list python-agate + python-dbfread)) (home-page "https://agate-dbf.rtfd.org") (synopsis "Add read support for dbf files to agate") (description "@code{agatedbf} uses a monkey patching pattern to add read @@ -202,13 +209,13 @@ (define-public python-agate-excel (define-public csvkit (package (name "csvkit") - (version "1.0.5") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "csvkit" version)) (sha256 (base32 - "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv")))) + "08wj0hlmbdmklar12cjzqp91vcxzwifsvmgasszas8kbiyvvgpdy")))) (build-system python-build-system) (native-inputs (list python-psycopg2 ; to test PostgreSQL support base-commit: cf44fb964e6216b153ab898002f2f2ab889532ce -- 2.39.2