From 39133e16cc59982d7c259e37d23d8448b23e055f Mon Sep 17 00:00:00 2001 From: Denis Fateyev Date: Nov 06 2019 17:04:55 +0000 Subject: python-apsw: bump upstream to 3.26.0-r1 --- diff --git a/.gitignore b/.gitignore index 11ce5cd..338ae54 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /apsw-3.23.1-r1.zip /apsw-3.24.0-r1.zip /apsw-3.28.0-r1.zip +/apsw-3.26.0-r1.zip diff --git a/0001-py3.8-avoid-invalid-escapes.patch b/0001-py3.8-avoid-invalid-escapes.patch deleted file mode 100644 index 1d73373..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 547f7f2..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/python-apsw.spec b/python-apsw.spec index 4e3b4a8..b49ba31 100644 --- a/python-apsw.spec +++ b/python-apsw.spec @@ -1,37 +1,37 @@ -# Deprecated Fedora support dropped, no need to track package versioning there. +# Deprecated RHEL/Fedora support dropped, no need to track package versioning there -%if 0%{?fedora} == 30 -%global sqlite_version 3.24.0 +%if 0%{?fedora} == 31 +%global sqlite_version 3.29.0 %global uprel 1 %global pkg_version %{sqlite_version}-r%{uprel} %endif -%if 0%{?fedora} >= 31 -%global sqlite_version 3.28.0 +%if 0%{?fedora} >= 32 +%global sqlite_version 3.30.1 +%global uprel 1 +%global pkg_version %{sqlite_version}-r%{uprel} +%endif + +%if 0%{?rhel} >= 8 +%global sqlite_version 3.26.0 %global uprel 1 %global pkg_version %{sqlite_version}-r%{uprel} %endif %global real_version %(eval echo %{pkg_version} | %{__sed} 's/-/./') -%filter_provides_in %{python2_sitearch}/.*\.so$ %filter_provides_in %{python3_sitearch}/.*\.so$ %filter_setup Name: python-apsw Version: %{real_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Another Python SQLite Wrapper License: zlib URL: https://github.com/rogerbinns/apsw Source: https://github.com/rogerbinns/apsw/releases/download/%{pkg_version}/apsw-%{pkg_version}.zip -# https://github.com/rogerbinns/apsw/pull/271 -Patch1: 0001-py3.8-avoid-invalid-escapes.patch -# https://github.com/rogerbinns/apsw/issues/272 -Patch2: 0002-Skip-one-test-on-python3.8.patch - BuildRequires: gcc BuildRequires: python%{python3_pkgversion}-devel BuildRequires: sqlite-devel >= %{sqlite_version} @@ -46,7 +46,7 @@ complete SQLite API into Python. %package -n python%{python3_pkgversion}-apsw Summary: Another Python SQLite Wrapper -%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} +%{?python_provide:%python_provide python%{python3_pkgversion}-apsw} %description -n python%{python3_pkgversion}-apsw APSW is a Python %{python3_version} wrapper for the SQLite embedded relational database @@ -74,10 +74,15 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} setup.py test %changelog -* Mon Aug 19 2019 Miro Hrončok - 3.24.0.r1-4 +* Wed Nov 06 2019 Denis Fateyev - 3.30.1.r1-1 +- Bump upstream version to 3.30.1 +- Added patch for vtables test support +- Added EPEL8 python3.6 support + +* Mon Aug 19 2019 Miro Hrončok - 3.28.0.r1-4 - Rebuilt for Python 3.8 -* Fri Jul 26 2019 Fedora Release Engineering - 3.24.0.r1-3 +* Fri Jul 26 2019 Fedora Release Engineering - 3.28.0.r1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Fri Jul 19 2019 Zbigniew Jędrzejewski-Szmek - 3.28.0.r1-2 diff --git a/sources b/sources index b040974..0c7d829 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apsw-3.28.0-r1.zip) = 31b35208bf79644394a1cd7c39739e08e23717a279de6f7fa4e638d3b14b73e7bd698ab055898cc74869e9c5ce35c8854e6c6239640b592eb0f50872aa082496 +SHA512 (apsw-3.26.0-r1.zip) = aafc38eb7c6850af4b3d7d1bdaf6a04eff00dfe59022ffdaebde666f02cff691f1aeb7471bd1ba74f5afc41fed9cc982d5e9757026680e8c2e582180a6bee4d7