* [bug#49678] [PATCH 00/12] Update csvkit, python-agate, python-sqlalchemy and friends
@ 2021-07-21 13:43 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
0 siblings, 1 reply; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:43 UTC (permalink / raw)
To: 49678
[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]
Hi Guix!
This series updates csvkit and co. The python-agate-sql package had
tests that expected a newer version of python-sqlalchemy so I've updated
it too, including its dependents.
Regarding sqlalchemy, the update from 1.3 to 1.4 looks like an API and
DB break, however the only dependent that still required 1.3 was
python-sadisplay, which appears to be unmaintained. I've left a 1.3
version of sqlalchemy around for this package, although we might want to
remove it altogether later.
WDYT?
Thanks,
Pierre
Pierre Langlois (12):
gnu: python-alembic: Update to 1.6.5.
gnu: python-flask-migrate: Update to 3.0.1.
gnu: python-flask-sqlalchemy: Update to 2.5.1.
gnu: python-sqlalchemy: Update to 1.4.21.
gnu: python-aws-xray-sdk: Update to 2.8.0.
gnu: python-openpyxl: Update to 3.0.7.
gnu: wireservice-package: Honour tests? option.
gnu: python-agate: Update to 1.6.3.
gnu: python-agate-dbf: Update to 0.2.2.
gnu: python-agate-sql: Update to 0.5.7.
gnu: python-agate-excel: Update to 0.2.4.
gnu: csvkit: Update to 1.0.6.
gnu/packages/databases.scm | 33 +++++++++---
gnu/packages/python-web.scm | 23 +++++----
gnu/packages/python-xyz.scm | 11 ++--
gnu/packages/wireservice.scm | 98 +++++++++++++++++++++---------------
4 files changed, 101 insertions(+), 64 deletions(-)
--
2.32.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5.
2021-07-21 13:43 [bug#49678] [PATCH 00/12] Update csvkit, python-agate, python-sqlalchemy and friends Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 02/12] gnu: python-flask-migrate: Update to 3.0.1 Pierre Langlois
` (10 more replies)
0 siblings, 11 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/databases.scm (python-alembic): Update to 1.6.5.
[arguments]: Honour tests? option in 'check phase.
---
gnu/packages/databases.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7de85d10c1..d8a70cb873 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -27,7 +27,7 @@
;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
-;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2017, 2018, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
@@ -3088,19 +3088,20 @@ this library provides functions to facilitate such comparisons.")
(define-public python-alembic
(package
(name "python-alembic")
- (version "1.4.3")
+ (version "1.6.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "alembic" version))
(sha256
- (base32 "0if2dgb088clk738p26bwk50735h6jpd2kacdgc5capv2hiz6d2k"))))
+ (base32 "0l9sx5g71mgaqp4q84q5fy9p0y4cy0a138aipaxnp3zvngmys7x2"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'check
- (lambda _
- (invoke "pytest" "-vv"))))))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-vv")))))))
(native-inputs
`(("python-mock" ,python-mock)
("python-pytest-cov" ,python-pytest-cov)))
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 02/12] gnu: python-flask-migrate: Update to 3.0.1.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 03/12] gnu: python-flask-sqlalchemy: Update to 2.5.1 Pierre Langlois
` (9 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/python-web.scm (python-flask-migrate): Update to 3.0.1.
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index ecea80444e..780805655f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -29,7 +29,7 @@
;;; Copyright © 2018, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot>
-;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
@@ -3894,14 +3894,14 @@ itself.")
(define-public python-flask-migrate
(package
(name "python-flask-migrate")
- (version "2.5.3")
+ (version "3.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Flask-Migrate" version))
(sha256
(base32
- "1vip9ww6l18dxffjsggm83k71zkvihxpnhaswpv8klh95s6517d6"))))
+ "00m76kgdkk0w5bfq8hbqszpyaqk0yxdvmz4s67lvd36pc7wfhhjd"))))
(build-system python-build-system)
(propagated-inputs
`(("python-flask" ,python-flask)
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 03/12] gnu: python-flask-sqlalchemy: Update to 2.5.1.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 02/12] gnu: python-flask-migrate: Update to 3.0.1 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 04/12] gnu: python-sqlalchemy: Update to 1.4.21 Pierre Langlois
` (8 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.5.1.
[home-page]: Follow redirect.
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 780805655f..a677645814 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3513,18 +3513,18 @@ applications.")
(define-public python-flask-sqlalchemy
(package
(name "python-flask-sqlalchemy")
- (version "2.4.4")
+ (version "2.5.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "Flask-SQLAlchemy" version))
(sha256
(base32
- "1rgsj49gnx361hnb3vn6c1h17497qh22yc3r70l1r6w0mw71bixz"))))
+ "04jrx4sjrz1b20j38qk4qin975xwz30krzq59rfv3b3w7ss49nib"))))
(build-system python-build-system)
(propagated-inputs
`(("python-flask" ,python-flask)
("python-sqlalchemy" ,python-sqlalchemy)))
- (home-page "https://github.com/mitsuhiko/flask-sqlalchemy")
+ (home-page "https://github.com/pallets/flask-sqlalchemy")
(synopsis "Module adding SQLAlchemy support to your Flask application")
(description
"This package adds SQLAlchemy support to your Flask application.")
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 04/12] gnu: python-sqlalchemy: Update to 1.4.21.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 02/12] gnu: python-flask-migrate: Update to 3.0.1 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 03/12] gnu: python-flask-sqlalchemy: Update to 2.5.1 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 05/12] gnu: python-aws-xray-sdk: Update to 2.8.0 Pierre Langlois
` (7 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/databases.scm (python-sqlalchemy): Update to 1.4.21.
[propagated-inputs]: Add python-greenlet.
(python-sqlalchemy-1.3): New variable.
(python-sadisplay)[propagated-inputs]: Use python-sqlalchemy-1.3.
---
gnu/packages/databases.scm | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index d8a70cb873..c0d94e56ab 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2942,18 +2942,20 @@ Database API 2.0T.")
(define-public python-sqlalchemy
(package
(name "python-sqlalchemy")
- (version "1.3.20")
+ (version "1.4.21")
(source
(origin
(method url-fetch)
(uri (pypi-uri "SQLAlchemy" version))
(sha256
- (base32 "18b9am7bsqc4nj3d2h5r93i002apczxfvpfpcqbd6f0385zmrwnj"))))
+ (base32 "1iwggnq2n7wd6vqqvym1fjnzrgs648saba1cs6nvw4pn9m7hbs87"))))
(build-system python-build-system)
(native-inputs
`(("python-cython" ,python-cython) ; for C extensions
("python-pytest" ,python-pytest)
("python-mock" ,python-mock))) ; for tests
+ (propagated-inputs
+ `(("python-greenlet" ,python-greenlet)))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -2969,6 +2971,17 @@ designed for efficient and high-performing database access, adapted into a
simple and Pythonic domain language.")
(license license:x11)))
+;; Required by python-sadisplay.
+(define-public python-sqlalchemy-1.3
+ (package (inherit python-sqlalchemy)
+ (version "1.3.24")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "SQLAlchemy" version))
+ (sha256
+ (base32 "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb"))))))
+
(define-public python2-sqlalchemy
(package-with-python2 python-sqlalchemy))
@@ -3305,6 +3318,9 @@ designed to be easy and intuitive to use.")
(define-public python2-psycopg2
(package-with-python2 python-psycopg2))
+;; FIXME: This package appears to be unmaintained upstream and relies on an
+;; older version of sqlalchemy, so may not actually be useful anymore,
+;; consider removing it.
(define-public python-sadisplay
(package
(name "python-sadisplay")
@@ -3318,7 +3334,7 @@ designed to be easy and intuitive to use.")
"01d9lxhmgpb68gy8rd6zj6fcwp84n2qq210n1qsk3qbsir79bzh4"))))
(build-system python-build-system)
(propagated-inputs
- `(("python-sqlalchemy" ,python-sqlalchemy)))
+ `(("python-sqlalchemy" ,python-sqlalchemy-1.3)))
(native-inputs
;; For tests.
`(("python-nose" ,python-nose)))
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 05/12] gnu: python-aws-xray-sdk: Update to 2.8.0.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (2 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 04/12] gnu: python-sqlalchemy: Update to 1.4.21 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 06/12] gnu: python-openpyxl: Update to 3.0.7 Pierre Langlois
` (6 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/python-web.scm (python-aws-xray-sdk): Update to 2.8.0.
[arguments]: Skip sqlalchemy_core/test_postgres.py and django/test_settings.py
tests. Honour tests? option in 'check phase.
---
gnu/packages/python-web.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a677645814..82944c1711 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -398,7 +398,7 @@ Model} (SAM) templates into AWS CloudFormation templates.")
(define-public python-aws-xray-sdk
(package
(name "python-aws-xray-sdk")
- (version "2.6.0")
+ (version "2.8.0")
(home-page "https://github.com/aws/aws-xray-sdk-python")
(source (origin
(method git-fetch)
@@ -406,7 +406,7 @@ Model} (SAM) templates into AWS CloudFormation templates.")
(file-name (git-file-name name version))
(sha256
(base32
- "12fzr0ylpa1lx3xr1x2f1jx8iiyzcr6g57fb9jign0j0lxdlbzpv"))))
+ "1kxhplfhb1asnqk0vr0r3adq0ainwhy5fn0x7xjvihslrj6f77xl"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -420,6 +420,7 @@ Model} (SAM) templates into AWS CloudFormation templates.")
"tests/ext/psycopg2/test_psycopg2.py"
"tests/ext/pymysql/test_pymysql.py"
"tests/ext/pynamodb/test_pynamodb.py"
+ "tests/ext/sqlalchemy_core/test_postgres.py"
"tests/test_async_recorder.py"
;; FIXME: Why is this failing?
@@ -428,17 +429,19 @@ Model} (SAM) templates into AWS CloudFormation templates.")
;; TODO: How to configure Django for these tests.
"tests/ext/django/test_db.py"
"tests/ext/django/test_middleware.py"
+ "tests/ext/django/test_settings.py"
;; These tests want to access httpbin.org.
"tests/ext/requests/test_requests.py"
"tests/ext/httplib/test_httplib.py"
"tests/ext/aiohttp/test_client.py"))))
(replace 'check
- (lambda _
+ (lambda* (#:key tests? #:allow-other-keys)
(setenv "PYTHONPATH"
(string-append "./build/lib:.:"
(getenv "PYTHONPATH")))
- (invoke "pytest" "-vv" "tests"))))))
+ (when tests?
+ (invoke "pytest" "-vv" "tests")))))))
(native-inputs
`(;; These are required for the test suite.
("python-bottle" ,python-bottle)
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 06/12] gnu: python-openpyxl: Update to 3.0.7.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (3 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 05/12] gnu: python-aws-xray-sdk: Update to 2.8.0 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 07/12] gnu: wireservice-package: Honour tests? option Pierre Langlois
` (5 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/python-xyz.scm (python-openpyxl): Update to 3.0.7.
[arguments]: Honour tests? option in 'check phase.
---
gnu/packages/python-xyz.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f329d55396..67bfde6464 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -62,7 +62,7 @@
;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
-;;; Copyright © 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
@@ -2220,7 +2220,7 @@ of @code{xmlfile}.")
(define-public python-openpyxl
(package
(name "python-openpyxl")
- (version "3.0.5")
+ (version "3.0.7")
(source
(origin
;; We use the upstream repository, as the tests are not included in the
@@ -2231,13 +2231,14 @@ of @code{xmlfile}.")
(changeset version)))
(file-name (string-append name "-" version "-checkout"))
(sha256
- (base32 "0s6fgwwkcfz1bnrp5gjd4g2lcbl4a76147ylkrmkbabi2nf4xlli"))))
+ (base32 "08ag16srijrbhxspj1k00f145gkpykycl0rrv10qn24g67hzgd10"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
- (lambda _
- (invoke "pytest"))))))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest")))))))
(native-inputs
;; For the test suite.
`(("python-lxml" ,python-lxml)
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 07/12] gnu: wireservice-package: Honour tests? option.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (4 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 06/12] gnu: python-openpyxl: Update to 3.0.7 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 08/12] gnu: python-agate: Update to 1.6.3 Pierre Langlois
` (4 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/wireservice.scm (wireservice-package)[arguments]: Honor
tests? option in 'check phase.
---
gnu/packages/wireservice.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index 9451e24d33..915e346dde 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;;
@@ -41,8 +41,9 @@
`(#:phases
(modify-phases %standard-phases
(replace 'check
- (lambda _
- (invoke "nosetests" "tests")))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "nosetests" "tests"))))
(add-after 'install 'install-docs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 08/12] gnu: python-agate: Update to 1.6.3.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (5 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 07/12] gnu: wireservice-package: Honour tests? option Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 09/12] gnu: python-agate-dbf: Update to 0.2.2 Pierre Langlois
` (3 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/wireservice.scm (python-agate): Update to 1.6.3.
Rewrite package definition to inherit from a base variable.
[arguments]: Add a 'set-guixlocpath phases.
---
gnu/packages/wireservice.scm | 74 +++++++++++++++++++++---------------
1 file changed, 44 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index 915e346dde..9811469082 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -24,7 +24,9 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
+ #:use-module (guix utils)
#: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)
@@ -89,37 +91,49 @@
charts now and don't care if they're perfect.")))
(define-public python-agate
- (wireservice-package
- (name "python-agate")
- (version "1.6.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/wireservice/agate")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl"))))
- (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)))
- (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)))
- (home-page "https://agate.rtfd.org")
- (synopsis "Data analysis library")
- (description "Agate is a Python data analysis library. It is an
+ (let ((base (wireservice-package
+ (name "python-agate")
+ (version "1.6.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wireservice/agate")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "12ramldv75mlhwz2f3w7yv6k88q7bq6q7hcl7k4822gdzhp2irdn"))))
+ (native-inputs
+ `(("glibc-locales" ,glibc-locales) ; for tests
+ ("python-nose" ,python-nose)
+ ("python-sphinx" ,python-sphinx)
+ ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
+ ("python-csselect" ,python-cssselect)
+ ("python-lxml" ,python-lxml)))
+ (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)))
+ (home-page "https://agate.rtfd.org")
+ (synopsis "Data analysis library")
+ (description "Agate is a Python data analysis library. It is an
alternative to numpy and pandas that solves real-world problems with readable
-code. Agate was previously known as journalism.")))
+code. Agate was previously known as journalism."))))
+ (package (inherit base)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The tests run setlocale.
+ (add-before 'check 'set-guixlocpath
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "GUIX_LOCPATH"
+ (string-append (assoc-ref inputs "glibc-locales")
+ "/lib/locale")))))))))))
(define-public python-agate-sql
(wireservice-package
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 09/12] gnu: python-agate-dbf: Update to 0.2.2.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (6 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 08/12] gnu: python-agate: Update to 1.6.3 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 10/12] gnu: python-agate-sql: Update to 0.5.7 Pierre Langlois
` (2 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/wireservice.scm (python-agate-dbf): Update to 0.2.2.
---
gnu/packages/wireservice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index 9811469082..5a6e0b0628 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -164,7 +164,7 @@ support to all @code{agate.Table} instances.")))
(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
@@ -173,7 +173,7 @@ support to all @code{agate.Table} instances.")))
(file-name (git-file-name name version))
(sha256
(base32
- "1y49fi6pmm7gzhajvqmfpcca2sqnwj24fqnsvzwk7r1hg2iaa2gi"))))
+ "03l3qlyw7588jhjjsiy15valqlzs8gjai8f74v18zv2za0zjqbzl"))))
(native-inputs
`(("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx)
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 10/12] gnu: python-agate-sql: Update to 0.5.7.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (7 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 09/12] gnu: python-agate-dbf: Update to 0.2.2 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 11/12] gnu: python-agate-excel: Update to 0.2.4 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 12/12] gnu: csvkit: Update to 1.0.6 Pierre Langlois
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/wireservice.scm (python-agate-sql): Update to 0.5.7.
---
gnu/packages/wireservice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index 5a6e0b0628..eb60f9d64a 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -138,7 +138,7 @@ code. Agate was previously known as journalism."))))
(define-public python-agate-sql
(wireservice-package
(name "python-agate-sql")
- (version "0.5.4")
+ (version "0.5.7")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -147,7 +147,7 @@ code. Agate was previously known as journalism."))))
(file-name (git-file-name name version))
(sha256
(base32
- "16q0b211n5b1qmhzkfl2jr56lda0rvyh5j1wzw26h2n4pm4wxlx2"))))
+ "1q6ywm0wzkkwcwk0884k0lycf8k7pzwz94rzb1y5ssm8b1gl0i62"))))
(native-inputs
`(("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx)
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 11/12] gnu: python-agate-excel: Update to 0.2.4.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (8 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 10/12] gnu: python-agate-sql: Update to 0.5.7 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 12/12] gnu: csvkit: Update to 1.0.6 Pierre Langlois
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/wireservice.scm (python-agate-excel): Update to 0.2.4.
[propagated-inputs]: Add python-olefile.
---
gnu/packages/wireservice.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index eb60f9d64a..6e1c9ae809 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -189,7 +189,7 @@ for dbf files support to all @code{agate.Table} instances.")))
(define-public python-agate-excel
(wireservice-package
(name "python-agate-excel")
- (version "0.2.3")
+ (version "0.2.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -198,7 +198,7 @@ for dbf files support to all @code{agate.Table} instances.")))
(file-name (git-file-name name version))
(sha256
(base32
- "1k5lv21k19s7kgbj5srd1xgrkqvxqqs49qwj33zncs9l7851afy7"))))
+ "18345szz3i7j81glmxacvw3bbh4k2h4i1n8i4xzfw3ywwm62mms1"))))
(native-inputs
`(("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx)
@@ -206,6 +206,7 @@ for dbf files support to all @code{agate.Table} instances.")))
(propagated-inputs
`(("python-agate" ,python-agate)
("python-openpyxl" ,python-openpyxl)
+ ("python-olefile" ,python-olefile)
("python-xlrd" ,python-xlrd)))
(home-page "https://agate-excel.rtfd.org")
(synopsis "Add read support for Excel files (xls and xlsx) to agate")
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#49678] [PATCH 12/12] gnu: csvkit: Update to 1.0.6.
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
` (9 preceding siblings ...)
2021-07-21 13:50 ` [bug#49678] [PATCH 11/12] gnu: python-agate-excel: Update to 0.2.4 Pierre Langlois
@ 2021-07-21 13:50 ` Pierre Langlois
10 siblings, 0 replies; 13+ messages in thread
From: Pierre Langlois @ 2021-07-21 13:50 UTC (permalink / raw)
To: 49678; +Cc: Pierre Langlois
* gnu/packages/wireservice.scm (csvkit): Update to 1.0.6.
---
gnu/packages/wireservice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index 6e1c9ae809..5aa2287982 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -216,13 +216,13 @@ for xls and xlsx files support to all @code{agate.Table} instances.")))
(define-public csvkit
(package
(name "csvkit")
- (version "1.0.5")
+ (version "1.0.6")
(source (origin
(method url-fetch)
(uri (pypi-uri "csvkit" version))
(sha256
(base32
- "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv"))))
+ "0d8dz25mzshd91wavmzgxq49mi7fgjg6lgasa6kpijawc2sn3xy8"))))
(build-system python-build-system)
(native-inputs
`(("python-psycopg2" ,python-psycopg2) ; to test PostgreSQL support
--
2.32.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-07-21 13:52 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-21 13:43 [bug#49678] [PATCH 00/12] Update csvkit, python-agate, python-sqlalchemy and friends Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 01/12] gnu: python-alembic: Update to 1.6.5 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 02/12] gnu: python-flask-migrate: Update to 3.0.1 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 03/12] gnu: python-flask-sqlalchemy: Update to 2.5.1 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 04/12] gnu: python-sqlalchemy: Update to 1.4.21 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 05/12] gnu: python-aws-xray-sdk: Update to 2.8.0 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 06/12] gnu: python-openpyxl: Update to 3.0.7 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 07/12] gnu: wireservice-package: Honour tests? option Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 08/12] gnu: python-agate: Update to 1.6.3 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 09/12] gnu: python-agate-dbf: Update to 0.2.2 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 10/12] gnu: python-agate-sql: Update to 0.5.7 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 11/12] gnu: python-agate-excel: Update to 0.2.4 Pierre Langlois
2021-07-21 13:50 ` [bug#49678] [PATCH 12/12] gnu: csvkit: Update to 1.0.6 Pierre Langlois
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.