From 9f3043625d6a1758472444ad4972788e8bda1693 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 25 Jul 2020 21:31:04 +0200 Subject: gnu: kyotocabinet: Update to 1.2.78. * gnu/packages/databases.scm (kyotocabinet): Update to 1.2.78. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ca320f25e8..f0bbcb519b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1973,14 +1973,14 @@ sets, bitmaps and hyperloglogs.") (define-public kyotocabinet (package (name "kyotocabinet") - (version "1.2.77") + (version "1.2.78") (source (origin (method url-fetch) (uri (string-append "https://fallabs.com/kyotocabinet/pkg/" "kyotocabinet-" version ".tar.gz")) (sha256 (base32 - "1rlx4307adbzd842b4npq6cwlw8h010ingxaz3qz1ijc70lr72an")))) + "1bxkf9kmcavq9rqridb8mvmrk3hj4447ffi24m2admsbm61n6k29")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 5f39462b6bb238a3ddfba75c640e050c99477a13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Jul 2020 02:57:33 +0200 Subject: gnu: python-psycopg2: Update to 2.8.5. * gnu/packages/databases.scm (python-psycopg2): Update to 2.8.5. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f0bbcb519b..e5aab2c9e8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2887,13 +2887,13 @@ designed to be easy and intuitive to use.") (define-public python-psycopg2 (package (name "python-psycopg2") - (version "2.8.4") + (version "2.8.5") (source (origin (method url-fetch) (uri (pypi-uri "psycopg2" version)) (sha256 - (base32 "1djvh98pi4hjd8rxbq8qzc63bg8v78k33yg6pl99wak61b6fb67q")))) + (base32 "06081jk9srkd4ra9j8b93x9ld3a2yxsbsf5bbbcivbm1yx065m7p")))) (build-system python-build-system) (arguments ;; Tests would require a postgresql database "psycopg2_test" -- cgit v1.2.3 From 8ae221211605f79216a72b18f9832b0fde2c5556 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 29 Jul 2020 10:03:24 +0200 Subject: gnu: mycli: Update to 1.22.1. * gnu/packages/databases.scm (mycli): Update to 1.22.1. Signed-off-by: Oleg Pykhalov --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e5aab2c9e8..7be1b2b8e7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -613,14 +613,14 @@ RDBMS systems (which are deep in functionality).") (define-public mycli (package (name "mycli") - (version "1.21.1") + (version "1.22.1") (source (origin (method url-fetch) (uri (pypi-uri "mycli" version)) (sha256 (base32 - "1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg")))) + "18qxxrpdksg3s73va7nkbkwi34kg9m1pls7w4fh5f4jk4p434zsf")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; tests expect a running MySQL -- cgit v1.2.3 From d343e0fe3ef823ab6067178cd13372ad2b496924 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 29 Jul 2020 09:53:40 +0200 Subject: gnu: python-sqlparse: Update to 0.3.1. * gnu/packages/databases.scm (python-sqlparse): Update to 0.3.1. Signed-off-by: Marius Bakke --- gnu/packages/databases.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 7be1b2b8e7..6d9d87f310 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -3106,13 +3107,13 @@ is designed to have a low barrier to entry.") (define-public python-sqlparse (package (name "python-sqlparse") - (version "0.2.4") + (version "0.3.1") (source (origin (method url-fetch) (uri (pypi-uri "sqlparse" version)) (sha256 (base32 - "1v3xh0bkfhb262dbndgzhivpnhdwavdzz8jjhx9vx0xbrx2880nf")))) + "0j652a6z7bdf6c77aczfn8m8b2nsr1bcqq48wzghf8vi6wvj0qp1")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From ce13a54aa1fc5bd3582d06a6a9dd1a879c8a5d40 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Aug 2020 20:09:29 +0200 Subject: gnu: mycli: Update to 1.22.2. * gnu/packages/databases.scm (mycli): Update to 1.22.2. --- gnu/packages/databases.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6d9d87f310..db8b74db06 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -614,14 +614,13 @@ RDBMS systems (which are deep in functionality).") (define-public mycli (package (name "mycli") - (version "1.22.1") + (version "1.22.2") (source (origin (method url-fetch) (uri (pypi-uri "mycli" version)) (sha256 - (base32 - "18qxxrpdksg3s73va7nkbkwi34kg9m1pls7w4fh5f4jk4p434zsf")))) + (base32 "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; tests expect a running MySQL -- cgit v1.2.3 From 007000ac38d2fdda08739ca74876d0b14240341b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Aug 2020 21:07:20 +0200 Subject: gnu: python-alembic: Update to 1.4.2. * gnu/packages/databases.scm (python-alembic): Update to 1.4.2. [source]: Remove patch. * gnu/packages/patches/python-alembic-exceptions-cause.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/databases.scm | 6 +- .../patches/python-alembic-exceptions-cause.patch | 69 ---------------------- 3 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 gnu/packages/patches/python-alembic-exceptions-cause.patch (limited to 'gnu/packages/databases.scm') diff --git a/gnu/local.mk b/gnu/local.mk index faf9888073..357ec3b7f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1453,7 +1453,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ - %D%/packages/patches/python-alembic-exceptions-cause.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index db8b74db06..6c1d95c126 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2703,15 +2703,13 @@ You might also want to install the following optional dependencies: (define-public python-alembic (package (name "python-alembic") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) - (patches (search-patches "python-alembic-exceptions-cause.patch")) (sha256 - (base32 - "0a4hzn76csgbf1px4f5vfm256byvjrqkgi9869nkcjrwjn35c6kr")))) + (base32 "1gsdrzx9h7wfva200qvvsc9sn4w79mk2vs0bbnzjhxi1jw2b0nh3")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/python-alembic-exceptions-cause.patch b/gnu/packages/patches/python-alembic-exceptions-cause.patch deleted file mode 100644 index b9844e5ad0..0000000000 --- a/gnu/packages/patches/python-alembic-exceptions-cause.patch +++ /dev/null @@ -1,69 +0,0 @@ -Fix a test failure with newer versions of SQLalchemy due to missing -"causes" for some exceptions. - -diff --git a/alembic/operations/ops.py b/alembic/operations/ops.py -index 5ec2762..7129472 100644 ---- a/alembic/operations/ops.py -+++ b/alembic/operations/ops.py -@@ -108,6 +108,7 @@ def from_constraint(cls, constraint): - "primary_key_constraint": "primary", - "check_constraint": "check", - "column_check_constraint": "check", -+ "table_or_column_check_constraint": "check", - } - - constraint_table = sqla_compat._table_for_constraint(constraint) -@@ -707,6 +708,7 @@ def batch_create_foreign_key( - "create_check_constraint", "batch_create_check_constraint" - ) - @AddConstraintOp.register_add_constraint("check_constraint") -+@AddConstraintOp.register_add_constraint("table_or_column_check_constraint") - @AddConstraintOp.register_add_constraint("column_check_constraint") - class CreateCheckConstraintOp(AddConstraintOp): - """Represent a create check constraint operation.""" -diff --git a/alembic/testing/assertions.py b/alembic/testing/assertions.py -index 3dc08f0..a78e5e8 100644 ---- a/alembic/testing/assertions.py -+++ b/alembic/testing/assertions.py -@@ -2,10 +2,9 @@ - - import re - -+from sqlalchemy import util - from sqlalchemy.engine import default - from sqlalchemy.testing.assertions import _expect_warnings --from sqlalchemy.testing.assertions import assert_raises # noqa --from sqlalchemy.testing.assertions import assert_raises_message # noqa - from sqlalchemy.testing.assertions import eq_ # noqa - from sqlalchemy.testing.assertions import is_ # noqa - from sqlalchemy.testing.assertions import is_false # noqa -@@ -17,6 +16,29 @@ - from ..util.compat import py3k - - -+def assert_raises(except_cls, callable_, *args, **kw): -+ try: -+ callable_(*args, **kw) -+ success = False -+ except except_cls: -+ success = True -+ -+ # assert outside the block so it works for AssertionError too ! -+ assert success, "Callable did not raise an exception" -+ -+ -+def assert_raises_message(except_cls, msg, callable_, *args, **kwargs): -+ try: -+ callable_(*args, **kwargs) -+ assert False, "Callable did not raise an exception" -+ except except_cls as e: -+ assert re.search(msg, util.text_type(e), re.UNICODE), "%r !~ %s" % ( -+ msg, -+ e, -+ ) -+ print(util.text_type(e).encode("utf-8")) -+ -+ - def eq_ignore_whitespace(a, b, msg=None): - # sqlalchemy.testing.assertion has this function - # but not with the special "!U" detection part -- cgit v1.2.3 From 66c1613efd2a59859dc266fc211415f3165baf30 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Aug 2020 00:14:00 +0200 Subject: gnu: lmdb: Update to 0.9.26. * gnu/packages/databases.scm (lmdb): Update to 0.9.26. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6c1d95c126..452260f489 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2149,7 +2149,7 @@ database.") (define-public lmdb (package (name "lmdb") - (version "0.9.25") + (version "0.9.26") (source (origin (method git-fetch) @@ -2158,7 +2158,7 @@ database.") (commit (string-append "LMDB_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w")))) + (base32 "0323xwb2rqyrr9vr6gbxc2kl89drhqw0ifmyh9pg9qgqmymyhxdx")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From ade5a616779a733a09a82e8b2eca494fbdc30495 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Aug 2020 22:43:55 +0200 Subject: gnu: python-lmdb: Update to 0.99. * gnu/packages/databases.scm (python-lmdb): Update to 0.99. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 452260f489..d3220c67d8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2450,13 +2450,13 @@ etc., and an SQL engine for performing simple SQL queries.") (define-public python-lmdb (package (name "python-lmdb") - (version "0.98") + (version "0.99") (source (origin (method url-fetch) (uri (pypi-uri "lmdb" version)) (sha256 (base32 - "027pgbdhhdcbwj53vrzr6a60gjhmz4s75gl3180fd4q8pwlbq986")) + "12fwlzfd82471ss9xzbqwcqc6f5miy51y72y2yya9j5cm9589szr")) (modules '((guix build utils))) (snippet ;; Delete bundled lmdb source files. -- cgit v1.2.3 From d26bf5294860c0130166b51f0832ab1118198812 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 19 Aug 2020 18:04:06 +0200 Subject: gnu: virtuoso-use: Remove static libraries. * gnu/packages/databases.scm (virtuoso-ose): Remove static libraries from the build output. --- gnu/packages/databases.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d3220c67d8..fe9978587c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2549,7 +2549,19 @@ implementation for Python.") ;; TODO: Removing the libsrc/zlib source directory breaks the build. ;; This indicates that the internal zlib code may still be used. #:configure-flags '("--without-internal-zlib" - "--with-readline"))) + "--with-readline" + "--enable-static=no") + #:phases + (modify-phases %standard-phases + ;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in + ;; the build output. The following phase removes it. + (add-after 'install 'remove-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (for-each (lambda (file) + (delete-file (string-append lib "/" file))) + '("libvirtuoso-t.a" + "libvirtuoso-t.la")))))))) (inputs `(("openssl" ,openssl-1.0) ("net-tools" ,net-tools) -- cgit v1.2.3