From: Ricardo Wurmus <rekado@elephly.net>
To: 60009@debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@elephly.net>
Subject: [bug#60009] [PATCH 10/18] gnu: python-apsw: Update to 3.40.0.0.
Date: Mon, 12 Dec 2022 15:27:08 +0100 [thread overview]
Message-ID: <20221212142716.9460-10-rekado@elephly.net> (raw)
In-Reply-To: <20221212142716.9460-1-rekado@elephly.net>
* gnu/packages/databases.scm (python-apsw): Update to 3.40.0.0.
[source]: Remove obsolete patch.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-cython.
[arguments]: Move build-extensions phase before build phase.
* gnu/local.mk (dist_patch_DATA): Remove patch.
* gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch: Remove file.
---
gnu/local.mk | 1 -
gnu/packages/databases.scm | 36 +++++++++----------
.../python-apsw-3.39.2.1-test-fix.patch | 27 --------------
3 files changed, 18 insertions(+), 46 deletions(-)
delete mode 100644 gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6e12f9cdb1..295be3c67c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1719,7 +1719,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3-hurd-configure.patch \
%D%/packages/patches/python-3-no-static-lib.patch \
- %D%/packages/patches/python-apsw-3.39.2.1-test-fix.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index b74762789a..9d1eec5ea0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -173,6 +173,7 @@ (define-module (gnu packages databases)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix build-system ruby)
@@ -3590,7 +3591,7 @@ (define-public python-pickleshare
(define-public python-apsw
(package
(name "python-apsw")
- (version "3.39.2.1")
+ (version "3.40.0.0")
;; The compressed release has fetching functionality disabled.
(source
(origin
@@ -3600,24 +3601,23 @@ (define-public python-apsw
version "/apsw-" version ".zip"))
(sha256
(base32
- "06x3qgg71xz8l3kz8gz04wkfp5f6zfrg476a4mm1c5hikqyw6ykj"))
- ;; Cherry-picked from upstream, remove when bumping to 3.39.3.
- (patches
- (search-patches "python-apsw-3.39.2.1-test-fix.patch"))))
- (build-system python-build-system)
- (native-inputs (list unzip))
- (inputs (list sqlite-next)) ;SQLite 3.39 required.
+ "02sgja00azvd08wi2wm105apmhp2644s7aw9b1zdg3dkcwjnsiad"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-cython unzip))
+ (inputs (list sqlite-next)) ;SQLite 3.40 required.
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke "python" "setup.py" "build" "--enable-all-extensions"
- "--enable=load_extension")))
- (add-after 'build 'build-test-helper
- (lambda _
- (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
- "-I." "-Isqlite3" "src/testextension.c"))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'build-extensions
+ (lambda _
+ (invoke "python" "setup.py" "build" "--enable-all-extensions"
+ "--enable=load_extension")))
+ (add-after 'build 'build-test-helper
+ (lambda _
+ (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
+ "-I." "-Isqlite3" "src/testextension.c"))))))
(home-page "https://github.com/rogerbinns/apsw/")
(synopsis "Another Python SQLite Wrapper")
(description
diff --git a/gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch b/gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch
deleted file mode 100644
index cc233e3ccd..0000000000
--- a/gnu/packages/patches/python-apsw-3.39.2.1-test-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1111f902075169bd0d96cdd10607ef8499f0fed5 Mon Sep 17 00:00:00 2001
-From: Roger Binns <rogerb@rogerbinns.com>
-Date: Mon, 5 Sep 2022 07:12:25 -0700
-Subject: [PATCH] Deal with mismatched SQLITE_ENABLE_COLUMN_METADATA
-
-Address #363
----
- apsw/tests.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletion(-)
-
-diff --git a/apsw/tests.py b/apsw/tests.py
-index b4a94d3..256ead0 100644
---- a/apsw/tests.py
-+++ b/apsw/tests.py
-@@ -772,8 +772,8 @@ class APSW(unittest.TestCase):
- c.execute("drop table foo; create table foo (%s)" % (", ".join(["[%s] %s" % (n, t) for n, t in cols]), ))
- c.execute("insert into foo([x a space]) values(1)")
- c.execute("create temp table two(fred banana); insert into two values(7); create temp view three as select fred as [a space] from two")
-- has_full=any(o=="ENABLE_COLUMN_METADATA" or o.startswith("ENABLE_COLUMN_METADATA=") for o in apsw.compile_options)
-+ has_full=any(o=="ENABLE_COLUMN_METADATA" or o.startswith("ENABLE_COLUMN_METADATA=") for o in apsw.compile_options) if apsw.using_amalgamation else hasattr(c, "description_full")
- for row in c.execute("select * from foo"):
- self.assertEqual(cols, c.getdescription())
- self.assertEqual(has_full, hasattr(c, "description_full"))
-
-base-commit: f628374c5857d940067ef26c9ea4e85a08a94f76
---
-2.37.2
--
2.36.1
next prev parent reply other threads:[~2022-12-12 14:29 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 14:22 [bug#60009] Update python-graphviz and other Python updates Ricardo Wurmus
2022-12-12 14:26 ` [bug#60009] [PATCH 01/18] gnu: python-graphviz: Update to 0.20.1 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 02/18] gnu: python-hyperopt: Update to 0.2.7 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 03/18] gnu: python-biopython: Update to 1.80 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 04/18] gnu: python-hicmatrix: Update to 16 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 05/18] gnu: python-pygenometracks: Update to 3.5 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 06/18] gnu: python-hicexplorer: Update to 3.7.2 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 07/18] gnu: python-dna-features-viewer: Update to 3.1.1 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 08/18] gnu: python-bokeh: Skip failing PIL test Ricardo Wurmus
2022-12-12 19:10 ` zimoun
2022-12-12 20:09 ` Ricardo Wurmus
2022-12-12 20:37 ` Simon Tournier
2022-12-12 23:06 ` Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 09/18] gnu: sqlite-next: Update to 3.40.0 Ricardo Wurmus
2022-12-12 19:08 ` zimoun
2022-12-12 20:11 ` Ricardo Wurmus
2022-12-12 20:56 ` Simon Tournier
2022-12-12 23:02 ` Ricardo Wurmus
2022-12-12 23:21 ` Simon Tournier
2022-12-12 23:26 ` bug#60009: " Ricardo Wurmus
2022-12-12 14:27 ` Ricardo Wurmus [this message]
2022-12-12 14:27 ` [bug#60009] [PATCH 11/18] gnu: python-cgatcore: Update to 0.6.14 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 12/18] gnu: python-flask-restful: Update to 0.3.9 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 13/18] gnu: python-marshmallow: Update to 3.19.0 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 14/18] gnu: python-apispec: Update to 6.0.2 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 15/18] gnu: python-pyjwt: Update to 2.6.0 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 16/18] gnu: python-flasgger: Update to 0.9.5 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 17/18] gnu: seqmagick: Update to 0.8.4 Ricardo Wurmus
2022-12-12 14:27 ` [bug#60009] [PATCH 18/18] gnu: cnvkit: Update to 0.9.9 Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221212142716.9460-10-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=60009@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.