Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/apsw/, dev-python/apsw/files/
Date: Fri, 23 Sep 2022 08:11:57
Message-Id: 1663920710.8497d6cf4ab0bfa8b6e45c85a8b13fe4b111bcfc.mgorny@gentoo
1 commit: 8497d6cf4ab0bfa8b6e45c85a8b13fe4b111bcfc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 23 07:55:48 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 23 08:11:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8497d6cf
7
8 dev-python/apsw: Bump to 3.39.3.0
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/apsw/Manifest | 1 +
13 dev-python/apsw/apsw-3.39.3.0.ebuild | 55 ++++++++++++++++++++++++++
14 dev-python/apsw/files/apsw-3.39.3.0-test.patch | 36 +++++++++++++++++
15 3 files changed, 92 insertions(+)
16
17 diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
18 index a529717cb763..29b5faaeabc1 100644
19 --- a/dev-python/apsw/Manifest
20 +++ b/dev-python/apsw/Manifest
21 @@ -1,3 +1,4 @@
22 DIST apsw-3.38.5-r1.gh.tar.gz 338186 BLAKE2B 145e38d4057be498f85a655ad7a437ec19a895769f58505b4b99093be30e67498faf9572494009db8e20e6700fa5e514605af131d045a4e8bb41587b828f5a88 SHA512 58331ca2db993f87316a55075ee9c440d4bd6e985e8ca11079391bd9cc2a907271ffe5c21d66840e336cd9e6568f6134c8b8fa5d28bbc7c77a1dddd48e8b99b7
23 DIST apsw-3.39.2.0.gh.tar.gz 345634 BLAKE2B 433455fdb0dbc6192bbb3ef47cc1d54faa310715b81312b999a84f90de61e5362e4af8d3a705816100381ae920283d84a50fb2e51308227eecf9de5b7166c4ac SHA512 4d3eb68d47cf8114e7823969277d0f42c4091632d4aeab61f66e91e99601b6a5286875515e860e27a2f736c943dad1657f5c47cbdd23a3d1479d3019bfd1c05b
24 DIST apsw-3.39.2.1.gh.tar.gz 363389 BLAKE2B 001efa8904c724ec051ac18d80ce55ce646c12ea4a218536494fa0e5804781ccc6c66287575c21553c0a97f4a806a5c7ab671116667d0368c32f7e614fd32a2f SHA512 10f08320157be96ad409472b50480b1b1875ec88ccb00690851aaef5864aa2bfc8000fce10ef0f00b820cfd5cebad950f0e7bba432018524cb292a6738ff30e8
25 +DIST apsw-3.39.3.0.gh.tar.gz 364874 BLAKE2B e23ca9ce125b2097f2e859d19053405070a3a09e061d27a175d4a3b721c4b68ac220b0522ca4e49075b937ebafdef8ba0cc5b0adc1ea389ee7c0c195b9f0850a SHA512 f9977f4112f2a7b11c0b0ab3576eada7b816dd69c518a637fc0152ba8fc4d12330febdd91abaf00af9e26049041024b590a4d60a9f055bf49c3301c92a68b539
26
27 diff --git a/dev-python/apsw/apsw-3.39.3.0.ebuild b/dev-python/apsw/apsw-3.39.3.0.ebuild
28 new file mode 100644
29 index 000000000000..08791f688c61
30 --- /dev/null
31 +++ b/dev-python/apsw/apsw-3.39.3.0.ebuild
32 @@ -0,0 +1,55 @@
33 +# Copyright 1999-2022 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +DISTUTILS_USE_PEP517=setuptools
39 +PYTHON_COMPAT=( python3_{8..11} )
40 +
41 +inherit distutils-r1
42 +
43 +DESCRIPTION="APSW - Another Python SQLite Wrapper"
44 +HOMEPAGE="
45 + https://github.com/rogerbinns/apsw/
46 + https://pypi.org/project/apsw/
47 +"
48 +SRC_URI="
49 + https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
50 + -> ${P}.gh.tar.gz
51 +"
52 +
53 +LICENSE="ZLIB"
54 +SLOT="0"
55 +KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
56 +IUSE="doc"
57 +
58 +DEPEND="
59 + >=dev-db/sqlite-${PV%.*}:3
60 +"
61 +RDEPEND="
62 + ${DEPEND}
63 +"
64 +
65 +PATCHES=(
66 + # upstream backport for test problem
67 + # https://github.com/rogerbinns/apsw/commit/ce1604f15544cffd5403764f6508bbe63726b5e3
68 + "${FILESDIR}"/${P}-test.patch
69 +)
70 +
71 +src_configure() {
72 + cat >> setup.cfg <<-EOF || die
73 + [build_ext]
74 + use_system_sqlite_config=True
75 + EOF
76 +}
77 +
78 +python_test() {
79 + esetup.py build_test_extension
80 + cd "${T}" || die
81 + "${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
82 +}
83 +
84 +python_install_all() {
85 + use doc && local HTML_DOCS=( doc/. )
86 + distutils-r1_python_install_all
87 +}
88
89 diff --git a/dev-python/apsw/files/apsw-3.39.3.0-test.patch b/dev-python/apsw/files/apsw-3.39.3.0-test.patch
90 new file mode 100644
91 index 000000000000..764fe4844bca
92 --- /dev/null
93 +++ b/dev-python/apsw/files/apsw-3.39.3.0-test.patch
94 @@ -0,0 +1,36 @@
95 +From a28713a9ebcc8d393beb270ca9fd5bf3b86a52bb Mon Sep 17 00:00:00 2001
96 +From: Roger Binns <rogerb@××××××××××.com>
97 +Date: Thu, 22 Sep 2022 08:33:13 -0700
98 +Subject: [PATCH] Ensure uncompleted statement is present
99 +
100 +It turns out that under some circumstances Python hasattr
101 +is actually doing a getattr. That means an incomplete statement
102 +needs to be present for the hasattr to not raise an exception.
103 +
104 +See #370
105 +---
106 + apsw/tests.py | 3 ++-
107 + 1 file changed, 2 insertions(+), 1 deletion(-)
108 +
109 +diff --git a/apsw/tests.py b/apsw/tests.py
110 +index bdaf70d..e9ad3c0 100644
111 +--- a/apsw/tests.py
112 ++++ b/apsw/tests.py
113 +@@ -772,6 +772,7 @@ class APSW(unittest.TestCase):
114 + c.execute("drop table foo; create table foo (%s)" % (", ".join(["[%s] %s" % (n, t) for n, t in cols]), ))
115 + c.execute("insert into foo([x a space]) values(1)")
116 + 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")
117 ++ c.execute("select 3") # see issue #370
118 + 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")
119 + for row in c.execute("select * from foo"):
120 + self.assertEqual(cols, c.getdescription())
121 +@@ -8835,4 +8836,4 @@ if __name__ == '__main__':
122 + del re
123 + gc.collect()
124 +
125 +- exit(exitcode)
126 +\ No newline at end of file
127 ++ exit(exitcode)
128 +--
129 +2.37.3
130 +