* [bug#63295] [PATCH] Update csvkit to 1.1.1
@ 2023-05-05 10:26 Alice BRENON
2023-05-05 12:41 ` Greg Hogan
0 siblings, 1 reply; 4+ messages in thread
From: Alice BRENON @ 2023-05-05 10:26 UTC (permalink / raw)
To: 63295
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
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
[-- Attachment #2: 0001-gnu-csvkit-Update-to-1.1.1.patch --]
[-- Type: text/x-patch, Size: 6065 bytes --]
From cbe0fc9bd86fbddcaf2564c2389cca0894616563 Mon Sep 17 00:00:00 2001
Message-Id: <cbe0fc9bd86fbddcaf2564c2389cca0894616563.1683281627.git.alice.brenon@ens-lyon.fr>
From: Alice BRENON <alice.brenon@ens-lyon.fr>
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#63295] [PATCH] Update csvkit to 1.1.1
2023-05-05 10:26 [bug#63295] [PATCH] Update csvkit to 1.1.1 Alice BRENON
@ 2023-05-05 12:41 ` Greg Hogan
2023-05-06 15:27 ` Alice BRENON
0 siblings, 1 reply; 4+ messages in thread
From: Greg Hogan @ 2023-05-05 12:41 UTC (permalink / raw)
To: Alice BRENON; +Cc: 63295
On Fri, May 5, 2023 at 6:27 AM Alice BRENON <alice.brenon@ens-lyon.fr> wrote:
>
> Hello guix,
>
> I use csvkit and noticed it broke after the upgrade to python 3.10
#62418 from March 24 also fixes csvkit with updated dependencies.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#63295] [PATCH] Update csvkit to 1.1.1
2023-05-05 12:41 ` Greg Hogan
@ 2023-05-06 15:27 ` Alice BRENON
2023-05-11 22:08 ` Greg Hogan
0 siblings, 1 reply; 4+ messages in thread
From: Alice BRENON @ 2023-05-06 15:27 UTC (permalink / raw)
To: Greg Hogan; +Cc: 63295
[-- Attachment #1: Type: text/plain, Size: 1032 bytes --]
Thanks for your vigilance and sorry for the duplicate. Following our
discussion I'll leave it open for now, hoping one of them will be
reviewed and accepted.
I'll also follow the advice of the linter (actually I had first gone for a
substitute* to fix the errors in the tests it was the linter which suggested I
updated the packages, making me completely rewrite my patch and taking some time
to check whether the dependencies where still needed and then I forgot to put a pair of
parenthesis back to the line where they belonged — that, and to re-run the
linter after having reworked on the patch that much, that is) and here is a
hopefully cleaner version of my patch.
Le Fri, 5 May 2023 08:41:31 -0400,
Greg Hogan <code@greghogan.com> a écrit :
> On Fri, May 5, 2023 at 6:27 AM Alice BRENON
> <alice.brenon@ens-lyon.fr> wrote:
> >
> > Hello guix,
> >
> > I use csvkit and noticed it broke after the upgrade to python 3.10
>
> #62418 from March 24 also fixes csvkit with updated dependencies.
[-- Attachment #2: 0001-gnu-csvkit-Update-to-1.1.1.patch --]
[-- Type: text/x-patch, Size: 6053 bytes --]
From 93f3fb1a88ac38bb66dbf39f074fbc21ebe25f77 Mon Sep 17 00:00:00 2001
Message-Id: <93f3fb1a88ac38bb66dbf39f074fbc21ebe25f77.1683386106.git.alice.brenon@ens-lyon.fr>
From: Alice BRENON <alice.brenon@ens-lyon.fr>
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 | 68 ++++++++++++++++++++----------------
1 file changed, 37 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index d315bc2d74..258671fc30 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,15 @@ (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 +92,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 +101,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 +156,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 +165,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 +208,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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#63295] [PATCH] Update csvkit to 1.1.1
2023-05-06 15:27 ` Alice BRENON
@ 2023-05-11 22:08 ` Greg Hogan
0 siblings, 0 replies; 4+ messages in thread
From: Greg Hogan @ 2023-05-11 22:08 UTC (permalink / raw)
To: Alice BRENON; +Cc: 63295
On Sat, May 6, 2023 at 11:27 AM Alice BRENON <alice.brenon@ens-lyon.fr> wrote:
>
> Thanks for your vigilance and sorry for the duplicate. Following our
> discussion I'll leave it open for now, hoping one of them will be
> reviewed and accepted.
>
> I'll also follow the advice of the linter (actually I had first gone for a
> substitute* to fix the errors in the tests it was the linter which suggested I
> updated the packages, making me completely rewrite my patch and taking some time
> to check whether the dependencies where still needed and then I forgot to put a pair of
> parenthesis back to the line where they belonged — that, and to re-run the
> linter after having reworked on the patch that much, that is) and here is a
> hopefully cleaner version of my patch.
The patch should be divided with each package update in a separate
patch (a large number of small, similar updates can be made in a
single patch).
Your update to python-agate includes glibc-locales (a 932 MiB package)
whereas mine added python-agate-locales as a new package. Yours has
(as noted) additional changes to the inputs.
My patchset updates python-agate-sql. I don't recall why, but it must
have fixed a breaking build. The only dependent package is csvkit.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-11 22:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-05 10:26 [bug#63295] [PATCH] Update csvkit to 1.1.1 Alice BRENON
2023-05-05 12:41 ` Greg Hogan
2023-05-06 15:27 ` Alice BRENON
2023-05-11 22:08 ` Greg Hogan
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).