Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at 2020-06-11 14:42:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3 (Old) and /work/SRC/openSUSE:Factory/.python3.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3" Thu Jun 11 14:42:30 2020 rev:98 rq:812851 version:3.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2020-05-20 18:35:52.516031149 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new.3606/python3-base.changes 2020-06-11 14:42:57.789064693 +0200 @@ -1,0 +2,17 @@ +Mon Jun 8 14:26:00 UTC 2020 - Matej Cepl <[email protected]> + +- add requires python3-base on libpython subpackage (bsc#1167008) + +------------------------------------------------------------------- +Fri Jun 5 06:08:12 UTC 2020 - Dirk Mueller <[email protected]> + +- build against Sphinx 2.x until python is compatible with + Sphinx 3.x (see gh#python/cpython#19397, bpo#40204) + +------------------------------------------------------------------- +Fri May 29 19:59:01 UTC 2020 - Andreas Stieger <[email protected]> + +- Fix build with SQLite 3.32 (bpo#40783) + add bpo40784-Fix-sqlite3-deterministic-test.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3-doc.changes 2020-05-20 18:35:52.808031761 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new.3606/python3-doc.changes 2020-06-11 14:42:58.937069116 +0200 @@ -2 +2,18 @@ -Sun May 17 15:40:11 UTC 2020 - Callum Farmer <[email protected]> +Mon Jun 8 14:26:00 UTC 2020 - Matej Cepl <[email protected]> + +- add requires python3-base on libpython subpackage (bsc#1167008) + +------------------------------------------------------------------- +Fri Jun 5 06:08:12 UTC 2020 - Dirk Mueller <[email protected]> + +- build against Sphinx 2.x until python is compatible with + Sphinx 3.x (see gh#python/cpython#19397, bpo#40204) + +------------------------------------------------------------------- +Fri May 29 19:59:01 UTC 2020 - Andreas Stieger <[email protected]> + +- Fix build with SQLite 3.32 (bpo#40783) + add bpo40784-Fix-sqlite3-deterministic-test.patch + +------------------------------------------------------------------- +Sun May 17 15:37:35 UTC 2020 - Callum Farmer <[email protected]> python3.changes: same change New: ---- bpo40784-Fix-sqlite3-deterministic-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-base.spec ++++++ --- /var/tmp/diff_new_pack.qQH5ob/_old 2020-06-11 14:43:02.585083169 +0200 +++ /var/tmp/diff_new_pack.qQH5ob/_new 2020-06-11 14:43:02.589083184 +0200 @@ -101,7 +101,7 @@ Source102: pre_checkin.sh Source103: skipped_tests.py ##### REQURES, PROVIDES, OBSOLETES ##### -Requires: libpython%{so_version} == %{version}-%{release} +Requires: libpython%{so_version} = %{version}-%{release} Requires: python-rpm-macros Recommends: python3 = %{version} #Recommends: python3-ensurepip @@ -204,6 +204,9 @@ # PATCH-FIX-UPSTREAM bsc1167501-invalid-alignment.patch gh#python/cpython#19133 [email protected] # Fix wrong misalignment of pointer to vectorcallfunc Patch31: bsc1167501-invalid-alignment.patch +# PATCH-FIX-UPSTREAM bpo40784-Fix-sqlite3-deterministic-test.patch bpo#40784 [email protected] +# Fix tests with SQLite 3.32 +Patch32: bpo40784-Fix-sqlite3-deterministic-test.patch ### COMMON-PATCH-END ### %description @@ -260,6 +263,7 @@ %package -n libpython%{so_version} Summary: Python Interpreter shared library Group: Development/Languages/Python +Requires: python3-base >= %{version} %description -n libpython%{so_version} Python is an interpreted, object-oriented programming language, and is @@ -298,6 +302,7 @@ %patch28 -p1 %patch29 -p1 %patch31 -p1 +%patch32 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.qQH5ob/_old 2020-06-11 14:43:02.605083247 +0200 +++ /var/tmp/diff_new_pack.qQH5ob/_new 2020-06-11 14:43:02.609083262 +0200 @@ -82,7 +82,7 @@ Source1: http://www.python.org/ftp/python/%{folderversion}/%{tarname}.tar.xz.asc Source99: python.keyring BuildRequires: libqt5-qttools -BuildRequires: python3-Sphinx >= 1.8 +BuildRequires: python3-Sphinx < 3.0 BuildRequires: python3-python-docs-theme BuildRequires: python3-sphinxcontrib-qthelp >= 1.0.2 BuildRequires: xz @@ -138,6 +138,9 @@ # PATCH-FIX-UPSTREAM bsc1167501-invalid-alignment.patch gh#python/cpython#19133 [email protected] # Fix wrong misalignment of pointer to vectorcallfunc Patch31: bsc1167501-invalid-alignment.patch +# PATCH-FIX-UPSTREAM bpo40784-Fix-sqlite3-deterministic-test.patch bpo#40784 [email protected] +# Fix tests with SQLite 3.32 +Patch32: bpo40784-Fix-sqlite3-deterministic-test.patch ### COMMON-PATCH-END ### %description @@ -184,6 +187,7 @@ %patch28 -p1 %patch29 -p1 %patch31 -p1 +%patch32 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.qQH5ob/_old 2020-06-11 14:43:02.629083339 +0200 +++ /var/tmp/diff_new_pack.qQH5ob/_new 2020-06-11 14:43:02.633083354 +0200 @@ -176,6 +176,9 @@ # PATCH-FIX-UPSTREAM bsc1167501-invalid-alignment.patch gh#python/cpython#19133 [email protected] # Fix wrong misalignment of pointer to vectorcallfunc Patch31: bsc1167501-invalid-alignment.patch +# PATCH-FIX-UPSTREAM bpo40784-Fix-sqlite3-deterministic-test.patch bpo#40784 [email protected] +# Fix tests with SQLite 3.32 +Patch32: bpo40784-Fix-sqlite3-deterministic-test.patch ### COMMON-PATCH-END ### %description @@ -257,6 +260,7 @@ %patch28 -p1 %patch29 -p1 %patch31 -p1 +%patch32 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ bpo40784-Fix-sqlite3-deterministic-test.patch ++++++ >From 00a240bf7f95bbd220f1cfbf9eb58484a5f9681a Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <[email protected]> Date: Fri, 29 May 2020 05:46:34 -0700 Subject: [PATCH] bpo-40784: Fix sqlite3 deterministic test (GH-20448) (cherry picked from commit c610d970f5373b143bf5f5900d4645e6a90fb460) Co-authored-by: Erlend Egeberg Aasland <[email protected]> --- Lib/sqlite3/test/userfunctions.py | 36 +++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py index 9501f535c4999..c11c82e127577 100644 --- a/Lib/sqlite3/test/userfunctions.py +++ b/Lib/sqlite3/test/userfunctions.py @@ -1,8 +1,7 @@ -#-*- coding: iso-8859-1 -*- # pysqlite2/test/userfunctions.py: tests for user-defined functions and # aggregates. # -# Copyright (C) 2005-2007 Gerhard H�ring <[email protected]> +# Copyright (C) 2005-2007 Gerhard Häring <[email protected]> # # This file is part of pysqlite. # @@ -158,6 +157,7 @@ def setUp(self): self.con.create_function("isblob", 1, func_isblob) self.con.create_function("islonglong", 1, func_islonglong) self.con.create_function("spam", -1, func) + self.con.execute("create table test(t text)") def tearDown(self): self.con.close() @@ -276,18 +276,36 @@ def CheckAnyArguments(self): val = cur.fetchone()[0] self.assertEqual(val, 2) + # Regarding deterministic functions: + # + # Between 3.8.3 and 3.15.0, deterministic functions were only used to + # optimize inner loops, so for those versions we can only test if the + # sqlite machinery has factored out a call or not. From 3.15.0 and onward, + # deterministic functions were permitted in WHERE clauses of partial + # indices, which allows testing based on syntax, iso. the query optimizer. + @unittest.skipIf(sqlite.sqlite_version_info < (3, 8, 3), "Requires SQLite 3.8.3 or higher") def CheckFuncNonDeterministic(self): mock = unittest.mock.Mock(return_value=None) - self.con.create_function("deterministic", 0, mock, deterministic=False) - self.con.execute("select deterministic() = deterministic()") - self.assertEqual(mock.call_count, 2) - - @unittest.skipIf(sqlite.sqlite_version_info < (3, 8, 3), "deterministic parameter not supported") + self.con.create_function("nondeterministic", 0, mock, deterministic=False) + if sqlite.sqlite_version_info < (3, 15, 0): + self.con.execute("select nondeterministic() = nondeterministic()") + self.assertEqual(mock.call_count, 2) + else: + with self.assertRaises(sqlite.OperationalError): + self.con.execute("create index t on test(t) where nondeterministic() is not null") + + @unittest.skipIf(sqlite.sqlite_version_info < (3, 8, 3), "Requires SQLite 3.8.3 or higher") def CheckFuncDeterministic(self): mock = unittest.mock.Mock(return_value=None) self.con.create_function("deterministic", 0, mock, deterministic=True) - self.con.execute("select deterministic() = deterministic()") - self.assertEqual(mock.call_count, 1) + if sqlite.sqlite_version_info < (3, 15, 0): + self.con.execute("select deterministic() = deterministic()") + self.assertEqual(mock.call_count, 1) + else: + try: + self.con.execute("create index t on test(t) where deterministic() is not null") + except sqlite.OperationalError: + self.fail("Unexpected failure while creating partial index") @unittest.skipIf(sqlite.sqlite_version_info >= (3, 8, 3), "SQLite < 3.8.3 needed") def CheckFuncDeterministicNotSupported(self):
