diff --git a/0001-py3.8-avoid-invalid-escapes.patch b/0001-py3.8-avoid-invalid-escapes.patch deleted file mode 100644 index 696be2f..0000000 --- a/0001-py3.8-avoid-invalid-escapes.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 746197f51ecb229acd75bcd566a1199ebe5fafe8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 19 Jul 2019 15:11:54 +0200 -Subject: [PATCH 1/2] py3.8: avoid invalid escapes - -python3-3.8.0~b2-1.fc31.x86_64 warns: - -/home/zbyszek/python/apsw/tests.py:1880: SyntaxWarning: invalid escape sequence \o - "or even a \0\0\0\0\0\0sequence\0\0\0\0\of them", - -:1: SyntaxWarning: invalid escape sequence \i -:1: SyntaxWarning: invalid escape sequence \i -:1: SyntaxWarning: invalid escape sequence \i -:1: SyntaxWarning: invalid escape sequence \i -:1: SyntaxWarning: invalid escape sequence \i -:1: SyntaxWarning: invalid escape sequence \i -:1: SyntaxWarning: invalid escape sequence \i -:1: SyntaxWarning: invalid escape sequence \i ---- - tests.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests.py b/tests.py -index 15eb35682d..5c46ebaab3 100644 ---- a/tests.py -+++ b/tests.py -@@ -1877,7 +1877,7 @@ class APSW(unittest.TestCase): - vals=("a simple string", - "a simple string\0with a null", - "a string\0with two\0nulls", -- "or even a \0\0\0\0\0\0sequence\0\0\0\0\of them", -+ "or even a \0\0\0\0\0\0sequence\0\0\0\0of them", - u(r"a \u1234 unicode \ufe54 string \u0089"), - u(r"a \u1234 unicode \ufe54 string \u0089\0and some text"), - u(r"\N{BLACK STAR} \N{WHITE STAR} \N{LIGHTNING} \N{COMET}\0more\0than you\0can handle"), -@@ -6008,7 +6008,7 @@ class APSW(unittest.TestCase): - # py 3 barfs with any codepoints above 0xffff whining - # about surrogates not being allowed. If only it - # implemented unicode properly. -- cmd(u("create table if not exists nastydata(x,y); insert into nastydata values(null,'xxx\\u1234\\uabcdyyy\r\n\t\"this \\is nasty\u0001stuff!');")) -+ cmd(u("create table if not exists nastydata(x,y); insert into nastydata values(null,'xxx\\u1234\\uabcdyyy\r\n\t\"this \\\\is nasty\u0001stuff!');")) - s.cmdloop() - isempty(fh[1]) - isempty(fh[2]) -@@ -6583,7 +6583,7 @@ class APSW(unittest.TestCase): - s.db.cursor().execute("pragma user_version=0") - # some nasty stuff - reset() -- cmd(u("create table nastydata(x,y); insert into nastydata values(null,'xxx\\u1234\\uabcd\\U00012345yyy\r\n\t\"this \\is nasty\u0001stuff!');" -+ cmd(u("create table nastydata(x,y); insert into nastydata values(null,'xxx\\u1234\\uabcd\\U00012345yyy\r\n\t\"this \\\\is nasty\u0001stuff!');" - 'create table "table"([except] int); create table [](""); create table [using]("&");' - )) - s.cmdloop() diff --git a/0002-Skip-one-test-on-python3.8.patch b/0002-Skip-one-test-on-python3.8.patch deleted file mode 100644 index ca40292..0000000 --- a/0002-Skip-one-test-on-python3.8.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8085e786afa0661418a8cefe5a1eaf7a535a5089 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 19 Jul 2019 15:36:40 +0200 -Subject: [PATCH 2/2] Skip one test on python3.8 - ---- - tests.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests.py b/tests.py -index 5c46ebaab3..42d9a257d7 100644 ---- a/tests.py -+++ b/tests.py -@@ -6300,7 +6300,8 @@ class APSW(unittest.TestCase): - s.cmdloop() - self.assertTrue("select 3;\n" in get(fh[2])) - # apsw can't tell where erroneous command ends so all processing on the line stops -- self.assertTrue("select error;select 4;\n" in get(fh[2])) -+ if sys.version_info < (3,8,0): -+ self.assertTrue("select error;select 4;\n" in get(fh[2])) - # is timing info output correctly? - reset() - timersupported=False diff --git a/3.28.0-r1.tar.gz b/3.28.0-r1.tar.gz deleted file mode 100644 index cb18831..0000000 --- a/3.28.0-r1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0347dd778f40e6d97ceeb3c469a5a06a64b1c69bb17d4a6e2c00db7ec38e2845 -size 307002 diff --git a/3.30.1-r1.tar.gz b/3.30.1-r1.tar.gz new file mode 100644 index 0000000..d059286 --- /dev/null +++ b/3.30.1-r1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b7adbc5aa6bc0b186d32ff813a1248817470da78dc9ebf4efc4ff0b475372dd +size 308553 diff --git a/python-apsw.changes b/python-apsw.changes index d76d724..db43aba 100644 --- a/python-apsw.changes +++ b/python-apsw.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Feb 4 19:50:05 UTC 2020 - Ondřej Súkup + +- update to 3.30.1-r1 +- drop 0002-Skip-one-test-on-python3.8.patch + 0001-py3.8-avoid-invalid-escapes.patch + * Updated hashing of SQL statements + * Updated Connection.config() with all current SQLITE_DBCONFIG constants + + ------------------------------------------------------------------- Tue Sep 10 13:32:46 UTC 2019 - Tomáš Chvátal diff --git a/python-apsw.spec b/python-apsw.spec index baf37cf..2b89f46 100644 --- a/python-apsw.spec +++ b/python-apsw.spec @@ -1,7 +1,7 @@ # # spec file for package python-apsw # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define tarver 3.28.0-r1 +%define tarver 3.30.1-r1 Name: python-apsw -Version: 3.28.0_r1 +Version: 3.30.1_r1 Release: 0 Summary: Another Python SQLite Wrapper License: Zlib Group: Development/Libraries/Python URL: https://github.com/rogerbinns/apsw/ Source: https://github.com/rogerbinns/apsw/archive/%{tarver}.tar.gz -Patch0: 0001-py3.8-avoid-invalid-escapes.patch -Patch1: 0002-Skip-one-test-on-python3.8.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: pkgconfig @@ -43,7 +41,6 @@ complete SQLite API into Python. %prep %setup -q -n apsw-%{tarver} -%autopatch -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing"