From 0e0296af4e46f51e25ebe1c484c9b59c1085474e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:00 +0200 Subject: gnu: perl-dbi, timescaledb: Fix typo in description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (perl-dbi, timescaledb): Fix ‘an database’ typo. --- 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 137627e8de..f97281e882 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1377,7 +1377,7 @@ pictures, sounds, or video.") (home-page "https://www.timescale.com/") (synopsis "Time-series extension for PostgreSQL") (description - "TimescaleDB is an database designed to make SQL scalable for + "TimescaleDB is a database designed to make SQL scalable for time-series data. It is engineered up from PostgreSQL and packaged as a PostgreSQL extension, providing automatic partitioning across time and space (partitioning key), as well as full SQL support.") @@ -1882,7 +1882,7 @@ extremely small.") "1yinx39960y241vf2sknxj0dfz82a5m9gvklq5rw78k0nlyrjawa")))) (build-system perl-build-system) (synopsis "Database independent interface for Perl") - (description "This package provides an database interface for Perl.") + (description "This package provides a database interface for Perl.") (home-page "https://metacpan.org/release/DBI") (license license:perl-license))) -- cgit v1.2.3 From ddd265b0335bf8baa38497528172fbc56923a0d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:01 +0200 Subject: gnu: galera: Update to 26.4.12. * gnu/packages/databases.scm (galera): Update to 26.4.12. --- 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 f97281e882..9cb5491f22 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1158,7 +1158,7 @@ developed in C/C++ to MariaDB and MySQL databases.") (define-public galera (package (name "galera") - (version "26.4.10") + (version "26.4.12") (source (origin (method git-fetch) (uri (git-reference @@ -1167,7 +1167,7 @@ developed in C/C++ to MariaDB and MySQL databases.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1n6zhzwj713ixyqvcjn4ldlq0y9fxqgvmqv3cj3h4207v9lwlxxz")))) + (base32 "0n4272mvr8a6h5prbhvl376asdp89ipix5yx5n6i1iiw9bs3v76l")))) (build-system cmake-build-system) (inputs (list check boost openssl)) -- cgit v1.2.3 From f0fa2b25ba9d98644af3e79f025716c46fbed29a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:00 +0200 Subject: gnu: python-pyodbc: Remove precompiled .pyc files from source. * gnu/packages/databases.scm (python-pyodbc)[source]: Add a snippet. Remove no-op file-name. --- gnu/packages/databases.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9cb5491f22..8ae9c674fb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3050,7 +3050,10 @@ for ODBC.") (uri (pypi-uri "pyodbc" version)) (sha256 (base32 "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5")) - (file-name (string-append name "-" version ".tar.gz")))) + (modules '((guix build utils))) + (snippet + ;; Delete precompiled binaries. The corresponding source is included. + #~(for-each delete-file (find-files "." "\\.pyc$"))))) (build-system python-build-system) (inputs (list unixodbc)) -- cgit v1.2.3 From 07edc13f0431401071f29ddb1982d92f00b63327 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:02 +0200 Subject: gnu: python-pyodbc: Document the test situation. * gnu/packages/databases.scm (python-pyodbc)[arguments]: Replace counterfactual comment with one that isn't. Add a custom 'check phase, which doesn't run. --- gnu/packages/databases.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8ae9c674fb..9bf4dc6bf0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3058,7 +3058,15 @@ for ODBC.") (inputs (list unixodbc)) (arguments - `(#:tests? #f)) ; no unit tests exist + ;; XXX Tests fail with ‘Can't open lib 'SQL Server Native Client 10.0' : + ;; file not found (0) (SQLDriverConnect)")’. + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python3" "tests3/test.py"))))))) (home-page "https://github.com/mkleehammer/pyodbc") (synopsis "Python ODBC Library") (description "@code{python-pyodbc} provides a Python DB-API driver -- cgit v1.2.3 From 64b12a1abfd7562c6d0652d05aad8cedf5400d9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:02 +0200 Subject: gnu: python-pyodbc: Update to 4.0.32. * gnu/packages/databases.scm (python-pyodbc): Update to 4.0.32. --- 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 9bf4dc6bf0..fd8cc5187c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3043,13 +3043,13 @@ for ODBC.") (define-public python-pyodbc (package (name "python-pyodbc") - (version "4.0.30") + (version "4.0.32") (source (origin (method url-fetch) (uri (pypi-uri "pyodbc" version)) (sha256 - (base32 "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5")) + (base32 "0sqs0x2l5mk3yv0wwz3ya8yh5f4babihyhc8hjbf2m86b71z1rcv")) (modules '((guix build utils))) (snippet ;; Delete precompiled binaries. The corresponding source is included. -- cgit v1.2.3 From 289b521584abc587140cfa047984e73eac119903 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:01 +0200 Subject: gnu: python-pyodbc-c: Don't use unstable tarball. * gnu/packages/databases.scm (python-pyodbc-c)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/databases.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index fd8cc5187c..ce7723b45f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3021,13 +3021,13 @@ development.") (version "3.1.4") (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/daym/pyodbc-c/repository/" - "archive.tar.gz?ref=v" version)) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/daym/pyodbc-c/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "05aq2297k779xidmxcwkrrxjvj1bh2q7d9a1rcjv6zr15y764ga9")) - (file-name (string-append name "-" version ".tar.gz")))) + (base32 "1mm2vif3b5yq0j6x3idl748w37n2i6j0clah3h967jyrl4p2c7vi")))) (build-system python-build-system) (inputs (list unixodbc)) -- cgit v1.2.3 From 89c7a2c891ec82ed3d9c2fbec677adc67736dd94 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:01 +0200 Subject: gnu: python-pyodbc-c: Update to 3.1.5. * gnu/packages/databases.scm (python-pyodbc-c): Update to 3.1.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 ce7723b45f..41cca7184b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3018,7 +3018,7 @@ development.") (define-public python-pyodbc-c (package (name "python-pyodbc-c") - (version "3.1.4") + (version "3.1.5") (source (origin (method git-fetch) @@ -3027,7 +3027,7 @@ development.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mm2vif3b5yq0j6x3idl748w37n2i6j0clah3h967jyrl4p2c7vi")))) + (base32 "08y60c5sx0k953zfx0s2a155l8py968sb17ap9a9fg8bjnj783k8")))) (build-system python-build-system) (inputs (list unixodbc)) -- cgit v1.2.3 From c794df84907cbfff85ecd8c0b054583ffbeae38f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:04 +0200 Subject: gnu: python-pyodbc-c: Fix metadata. It appears to have been copied from python-pyodbc, a different project. * gnu/packages/databases.scm (python-pyodbc-c)[synopsis, description]: Describe this project instead, and how it differs. [home-page]: Point elsewhere. --- gnu/packages/databases.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 41cca7184b..bf00c9d23d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3034,10 +3034,13 @@ development.") (arguments `(;; No unit tests exist. #:tests? #f)) - (home-page "https://github.com/mkleehammer/pyodbc") - (synopsis "Python ODBC Library") + (home-page "https://gitlab.com/daym/pyodbc-c") + (synopsis "Python ODBC Library written in C") (description "@code{python-pyodbc-c} provides a Python DB-API driver -for ODBC.") +for ODBC, similar to python-pyodbc but written in C. + +It's designed to stand alone and not have other dependencies on other packages +or languages. It uses only Python's built-in data types.") (license (license:x11-style "file://LICENSE.TXT")))) (define-public python-pyodbc -- cgit v1.2.3 From b8686f1bfca19816b75d376df52966386a48f082 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:00 +0200 Subject: gnu: python-pyodbc-c: Fix comment. * gnu/packages/databases.scm (python-pyodbc-c): Fix comment about tests. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/databases.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bf00c9d23d..9980cbe9aa 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3032,7 +3032,7 @@ development.") (inputs (list unixodbc)) (arguments - `(;; No unit tests exist. + `(;; The tests require a running SQL server that they don't help set up. #:tests? #f)) (home-page "https://gitlab.com/daym/pyodbc-c") (synopsis "Python ODBC Library written in C") -- cgit v1.2.3