* [gentoo-commits] repo/gentoo:master commit in: dev-python/apsw/, dev-python/apsw/files/
@ 2016-01-30 15:44 Ian Delaney
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney @ 2016-01-30 15:44 UTC (permalink / raw
To: gentoo-commits
commit: 1a4e5dbf5ea339164b251e7e0324bd1254814ff4
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 15:43:04 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 15:43:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4e5dbf
dev-python/apsw: revbump to vn. -3.9.2_p1-r1
revbump uses new SRC_URI fetching an adjusted tarball with a pre-built
set of docs; add IUSE doc and doc install in the usual form
Also bump to EAPI 6, patch submitted by E. Myers via the gentoo bug
Gentoo bug: #573316
Package-Manager: portage-2.2.26
dev-python/apsw/Manifest | 2 +-
...psw-3.9.2_p1.ebuild => apsw-3.9.2_p1-r1.ebuild} | 25 ++++++++++++----------
.../apsw/files/apsw-3.6.20.1-fix_tests.patch | 4 ++--
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 4adc939..7183715 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1,4 @@
DIST apsw-3.8.10.1_p1.tar.gz 307142 SHA256 af20221e1a65f593b47d83f1f8a136afc6d2199a22bc014251a44e31e7b0ca17 SHA512 1f997c6c88ca65995c8b5d894135d5900a4d2f56f877f74f0e99eab4ede0d06be5730ce282a5d99358318ca076eec75f2afe271574b6c02aaabf4bef181d0bda WHIRLPOOL 3e9b609a19ee39edda9af8140982c74d53d3e2b4c0bd05ea53974cb7a3c2f12f13ab4acf1d51ac5b50ee738f5380dc83b819e0ed11bf28107f903f0a52eb5949
DIST apsw-3.8.11.1_p1.tar.gz 307797 SHA256 f4dc653aca10dfae8578c8bf1125600f77d0d8dcc85b4185754388aa87ae0997 SHA512 4ca857d32f423475b17e81130d4919627d581b80dd6f3f120d95906ddad657d6f52eb69fb211612e15f5eaee0211c0ad992391c93068a463e72670d49f69c61e WHIRLPOOL 15a58a83e1e5f3ee4afc470a0d58e29f5ee5cf416897b1c83ad021fb9c47f0533a5e01417aa59fb74e7b33ad9e5f1a74b40c0cbffcee4cf01617006dbad3dc2a
DIST apsw-3.8.7.1_p1.tar.gz 303446 SHA256 7aee29cc170332aa1a16fb80753152e809208bbc91823f64178e4afc32526fec SHA512 104aad3a8cec07647b71c77814cc069587daf84450b41f992d0b3c752c476105351b28912768a29f7952bfd75e9b2d3fcd8e6ae758b3bab8b986bf8e1300c256 WHIRLPOOL cc95728b07e384ee88002afce4b68abcfb259a62188cc77bad1154a83bf3e1979fec8761fe8a3c9e5ae35d5027cdf42c1b4a4b7749ad76d7935e032e253c8167
-DIST apsw-3.9.2_p1.tar.gz 308216 SHA256 6fae3f701f5cadca47195d814a02cec016f813f35d9d44d39596d293f5067577 SHA512 530940debc738e0902af266ccd14567c7ec6afe5866dcc2d66ace939cb681ea30da6b34e688ab986531266833e691a0233ad0c19bc4a105bb9e8c05f97adb537 WHIRLPOOL d44be5fa9245faea35c2f9fce894e62eac676957cdcce75673f3a671a01a3dd05c1bbfeca9b85f227419a1a46921324585675cbcc65cc83eb364520e5cf4a4b7
+DIST apsw-3.9.2_p1.zip 676275 SHA256 c1a9ff8b82658977eb0646b8400475a45342bd3fd197a51c48a8d78cc78b72d9 SHA512 dc85b4face24f03793ae8ca9744e55641230751fd888dedf423e2b33fc421c4cb13ce8105a2b7d801f504de4897f29de38c05da3f209204acf76172ace5605ad WHIRLPOOL a2328659f640cfaf4ab5975d54e94638495319767ae655a7011f95bc0062ec18e9a4b942b1e4d6d8c7d813cc848e986b5d56aa92db1dfac367769a8447506fb0
diff --git a/dev-python/apsw/apsw-3.9.2_p1.ebuild b/dev-python/apsw/apsw-3.9.2_p1-r1.ebuild
similarity index 61%
rename from dev-python/apsw/apsw-3.9.2_p1.ebuild
rename to dev-python/apsw/apsw-3.9.2_p1-r1.ebuild
index e556884..2fefe02 100644
--- a/dev-python/apsw/apsw-3.9.2_p1.ebuild
+++ b/dev-python/apsw/apsw-3.9.2_p1-r1.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic
MY_PV=${PV/_p/-r}
MY_P=${PN}-${MY_PV}
DESCRIPTION="APSW - Another Python SQLite Wrapper"
HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
+PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
python_compile() {
if ! python_is_python3; then
- local CFLAGS="${CFLAGS} -fno-strict-aliasing"
- export CFLAGS
+ append-cflags -fno-strict-aliasing
fi
distutils-r1_python_compile --enable=load_extension
}
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/. )
+ distutils-r1_python_install_all
+}
+
python_test() {
"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
}
-
-# Docs build is presently non-functional due to upstream issues
-# See https://github.com/rogerbinns/apsw/issues/198
diff --git a/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch
index 3bbce88..e252bf3 100644
--- a/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch
+++ b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch
@@ -1,5 +1,5 @@
---- tests.py
-+++ tests.py
+--- a/tests.py
++++ b/tests.py
@@ -5480,7 +5480,7 @@
testnasty()
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/apsw/, dev-python/apsw/files/
@ 2022-09-23 8:11 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-09-23 8:11 UTC (permalink / raw
To: gentoo-commits
commit: 8497d6cf4ab0bfa8b6e45c85a8b13fe4b111bcfc
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 07:55:48 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 08:11:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8497d6cf
dev-python/apsw: Bump to 3.39.3.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/apsw/Manifest | 1 +
dev-python/apsw/apsw-3.39.3.0.ebuild | 55 ++++++++++++++++++++++++++
dev-python/apsw/files/apsw-3.39.3.0-test.patch | 36 +++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index a529717cb763..29b5faaeabc1 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,3 +1,4 @@
DIST apsw-3.38.5-r1.gh.tar.gz 338186 BLAKE2B 145e38d4057be498f85a655ad7a437ec19a895769f58505b4b99093be30e67498faf9572494009db8e20e6700fa5e514605af131d045a4e8bb41587b828f5a88 SHA512 58331ca2db993f87316a55075ee9c440d4bd6e985e8ca11079391bd9cc2a907271ffe5c21d66840e336cd9e6568f6134c8b8fa5d28bbc7c77a1dddd48e8b99b7
DIST apsw-3.39.2.0.gh.tar.gz 345634 BLAKE2B 433455fdb0dbc6192bbb3ef47cc1d54faa310715b81312b999a84f90de61e5362e4af8d3a705816100381ae920283d84a50fb2e51308227eecf9de5b7166c4ac SHA512 4d3eb68d47cf8114e7823969277d0f42c4091632d4aeab61f66e91e99601b6a5286875515e860e27a2f736c943dad1657f5c47cbdd23a3d1479d3019bfd1c05b
DIST apsw-3.39.2.1.gh.tar.gz 363389 BLAKE2B 001efa8904c724ec051ac18d80ce55ce646c12ea4a218536494fa0e5804781ccc6c66287575c21553c0a97f4a806a5c7ab671116667d0368c32f7e614fd32a2f SHA512 10f08320157be96ad409472b50480b1b1875ec88ccb00690851aaef5864aa2bfc8000fce10ef0f00b820cfd5cebad950f0e7bba432018524cb292a6738ff30e8
+DIST apsw-3.39.3.0.gh.tar.gz 364874 BLAKE2B e23ca9ce125b2097f2e859d19053405070a3a09e061d27a175d4a3b721c4b68ac220b0522ca4e49075b937ebafdef8ba0cc5b0adc1ea389ee7c0c195b9f0850a SHA512 f9977f4112f2a7b11c0b0ab3576eada7b816dd69c518a637fc0152ba8fc4d12330febdd91abaf00af9e26049041024b590a4d60a9f055bf49c3301c92a68b539
diff --git a/dev-python/apsw/apsw-3.39.3.0.ebuild b/dev-python/apsw/apsw-3.39.3.0.ebuild
new file mode 100644
index 000000000000..08791f688c61
--- /dev/null
+++ b/dev-python/apsw/apsw-3.39.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+ https://github.com/rogerbinns/apsw/
+ https://pypi.org/project/apsw/
+"
+SRC_URI="
+ https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ >=dev-db/sqlite-${PV%.*}:3
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+PATCHES=(
+ # upstream backport for test problem
+ # https://github.com/rogerbinns/apsw/commit/ce1604f15544cffd5403764f6508bbe63726b5e3
+ "${FILESDIR}"/${P}-test.patch
+)
+
+src_configure() {
+ cat >> setup.cfg <<-EOF || die
+ [build_ext]
+ use_system_sqlite_config=True
+ EOF
+}
+
+python_test() {
+ esetup.py build_test_extension
+ cd "${T}" || die
+ "${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/. )
+ distutils-r1_python_install_all
+}
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
new file mode 100644
index 000000000000..764fe4844bca
--- /dev/null
+++ b/dev-python/apsw/files/apsw-3.39.3.0-test.patch
@@ -0,0 +1,36 @@
+From a28713a9ebcc8d393beb270ca9fd5bf3b86a52bb Mon Sep 17 00:00:00 2001
+From: Roger Binns <rogerb@rogerbinns.com>
+Date: Thu, 22 Sep 2022 08:33:13 -0700
+Subject: [PATCH] Ensure uncompleted statement is present
+
+It turns out that under some circumstances Python hasattr
+is actually doing a getattr. That means an incomplete statement
+needs to be present for the hasattr to not raise an exception.
+
+See #370
+---
+ apsw/tests.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/apsw/tests.py b/apsw/tests.py
+index bdaf70d..e9ad3c0 100644
+--- a/apsw/tests.py
++++ b/apsw/tests.py
+@@ -772,6 +772,7 @@ 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")
++ c.execute("select 3") # see issue #370
+ 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())
+@@ -8835,4 +8836,4 @@ if __name__ == '__main__':
+ del re
+ gc.collect()
+
+- exit(exitcode)
+\ No newline at end of file
++ exit(exitcode)
+--
+2.37.3
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-23 8:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-30 15:44 [gentoo-commits] repo/gentoo:master commit in: dev-python/apsw/, dev-python/apsw/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2022-09-23 8:11 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox