diff --git a/00001-rpath.patch b/00001-rpath.patch index 15f95a9..b7248a9 100644 --- a/00001-rpath.patch +++ b/00001-rpath.patch @@ -1,4 +1,4 @@ -From 08c67bfedd07ebec54f5087b59045b8c78fa2a6d Mon Sep 17 00:00:00 2001 +From 96f709265ee207c0aab9023e9fc969bdc5e944a9 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 13 Jan 2010 21:25:18 +0000 Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard diff --git a/00102-lib64.patch b/00102-lib64.patch index 5acaf5c..f85c3f3 100644 --- a/00102-lib64.patch +++ b/00102-lib64.patch @@ -1,4 +1,4 @@ -From be6b9803109c3702dbff0ed8b0953913206008ca Mon Sep 17 00:00:00 2001 +From b4cc171c0e08afc582d96ab45c12b4fb4c7da341 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 13 Jan 2010 21:25:18 +0000 Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/ @@ -198,7 +198,7 @@ index b727f66953..a0c5fb6139 100644 return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } diff --git a/configure b/configure -index 8886561645..78867c6ffc 100755 +index 96dcd0dcd5..0ce1db97ac 100755 --- a/configure +++ b/configure @@ -15214,9 +15214,9 @@ fi @@ -214,7 +214,7 @@ index 8886561645..78867c6ffc 100755 diff --git a/configure.ac b/configure.ac -index d8de9d4943..477a5ff1cb 100644 +index 18a044629a..b1c80869e4 100644 --- a/configure.ac +++ b/configure.ac @@ -4689,9 +4689,9 @@ fi diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch index ed8ca3e..7d7e074 100644 --- a/00111-no-static-lib.patch +++ b/00111-no-static-lib.patch @@ -1,4 +1,4 @@ -From 50236468e82a7a19ed3dd7e13cb922e7d3e0ff7f Mon Sep 17 00:00:00 2001 +From 980d366e4d1422de9d91723c8a33632861d5309b Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 18 Jan 2010 17:59:07 +0000 Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index 4aec85c..c82d5b6 100644 --- a/00189-use-rpm-wheels.patch +++ b/00189-use-rpm-wheels.patch @@ -1,4 +1,4 @@ -From 36f1f2b4620b13bdc7ac1c349253ac07960c33b3 Mon Sep 17 00:00:00 2001 +From 22960e3e57a040a4695a0e020dbf7536bffb9ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 15 Aug 2018 15:36:29 +0200 Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels @@ -9,7 +9,7 @@ We keep them in /usr/share/python-wheels 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py -index 566fb2a096..47da08d3d5 100644 +index f3152a55d4..f58dab1800 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,6 +1,7 @@ @@ -27,10 +27,10 @@ index 566fb2a096..47da08d3d5 100644 +_WHEEL_DIR = "/usr/share/python-wheels/" --_SETUPTOOLS_VERSION = "41.2.0" +-_SETUPTOOLS_VERSION = "47.1.0" +_wheels = {} --_PIP_VERSION = "19.2.3" +-_PIP_VERSION = "20.1.1" +def _get_most_recent_wheel_version(pkg): + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + _wheels[pkg] = {} @@ -47,12 +47,12 @@ index 566fb2a096..47da08d3d5 100644 +_PIP_VERSION = _get_most_recent_wheel_version("pip") _PROJECTS = [ - ("setuptools", _SETUPTOOLS_VERSION), + ("setuptools", _SETUPTOOLS_VERSION, "py3"), @@ -105,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, # additional paths that need added to sys.path additional_paths = [] - for project, version in _PROJECTS: -- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) + for project, version, py_tag in _PROJECTS: +- wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag) - whl = pkgutil.get_data( - "ensurepip", - "_bundled/{}".format(wheel_name), diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch index e993c42..d1f860a 100644 --- a/00251-change-user-install-location.patch +++ b/00251-change-user-install-location.patch @@ -1,4 +1,4 @@ -From 197b8de27ebcd17fc5dd51426a639950c6f6c284 Mon Sep 17 00:00:00 2001 +From c000bc02e571e68c35527f1d3280363ef337431b Mon Sep 17 00:00:00 2001 From: Michal Cyprian Date: Mon, 26 Jun 2017 16:32:56 +0200 Subject: [PATCH] 00251: Change user install location diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch index 26654f2..78f6403 100644 --- a/00274-fix-arch-names.patch +++ b/00274-fix-arch-names.patch @@ -1,4 +1,4 @@ -From 3172104314227af128f3ce68e9650663a7c1268c Mon Sep 17 00:00:00 2001 +From 4b55be571b62497e95192fb45de1f0a8b9807ea8 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 28 Aug 2017 17:16:46 +0200 Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change @@ -29,7 +29,7 @@ index ba37cf99e2..52a9ec6662 100755 ppc64le | powerpc64little) basic_machine=powerpc64le-unknown diff --git a/configure.ac b/configure.ac -index 477a5ff1cb..aea27ef86a 100644 +index b1c80869e4..de4627e236 100644 --- a/configure.ac +++ b/configure.ac @@ -747,9 +747,9 @@ cat >> conftest.c < Date: Thu, 11 Jul 2019 13:44:13 +0200 Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default diff --git a/00350-sqlite-fix-deterministic-test.patch b/00350-sqlite-fix-deterministic-test.patch deleted file mode 100644 index fbc52ec..0000000 --- a/00350-sqlite-fix-deterministic-test.patch +++ /dev/null @@ -1,76 +0,0 @@ -commit 00a240bf7f95bbd220f1cfbf9eb58484a5f9681a -Author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> -Date: Fri May 29 05:46:34 2020 -0700 - - bpo-40784: Fix sqlite3 deterministic test (GH-20448) - - (cherry picked from commit c610d970f5373b143bf5f5900d4645e6a90fb460) - - Co-authored-by: Erlend Egeberg Aasland - -diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py -index 9501f53..c11c82e 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 -+# Copyright (C) 2005-2007 Gerhard Häring - # - # This file is part of pysqlite. - # -@@ -158,6 +157,7 @@ class FunctionTests(unittest.TestCase): - 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 @@ class FunctionTests(unittest.TestCase): - 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): diff --git a/python38.spec b/python38.spec index ee014ba..b106af1 100644 --- a/python38.spec +++ b/python38.spec @@ -13,11 +13,11 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well -%global general_version %{pybasever}.3 -#global prerel ... +%global general_version %{pybasever}.4 +%global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python @@ -271,12 +271,6 @@ Patch274: 00274-fix-arch-names.patch # Ideally, we should talk to upstream and explain why we don't want this Patch328: 00328-pyc-timestamp-invalidation-mode.patch -# 00350 # -# bpo-40784: Fix sqlite3 deterministic test (GH-20448) -# https://bugs.python.org/issue40784 -# https://github.com/python/cpython/commit/00a240bf7f95bbd220f1cfbf9eb58484a5f9681a -Patch350: 00350-sqlite-fix-deterministic-test.patch - # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -394,8 +388,8 @@ Summary: Python runtime libraries Requires: python-setuptools-wheel Requires: python-pip-wheel %else -Provides: bundled(python3-pip) = 19.2.3 -Provides: bundled(python3-setuptools) = 41.2.0 +Provides: bundled(python3-pip) = 20.1.1 +Provides: bundled(python3-setuptools) = 47.1.0 %endif %{?python_provide:%python_provide python3-libs} @@ -576,8 +570,8 @@ The debug runtime additionally supports debug builds of C-API extensions Requires: python-setuptools-wheel Requires: python-pip-wheel %else -Provides: bundled(python3-pip) = 19.2.3 -Provides: bundled(python3-setuptools) = 41.2.0 +Provides: bundled(python3-pip) = 20.1.1 +Provides: bundled(python3-setuptools) = 47.1.0 %endif # The description for the flat package @@ -624,7 +618,6 @@ rm Lib/ensurepip/_bundled/*.whl %patch251 -p1 %patch274 -p1 %patch328 -p1 -%patch350 -p1 # Remove files that should be generated by the build @@ -1577,6 +1570,9 @@ CheckPython optimized # ====================================================== %changelog +* Tue Jun 30 2020 Miro Hrončok - 3.8.4~rc1-1 +- Rebased to 3.8.4rc1 + * Fri May 29 2020 Victor Stinner - 3.8.3-2 - Fix sqlite3 deterministic test diff --git a/sources b/sources index 79d3eba..b7086bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.8.3.tar.xz) = 3103bd8d944f3905eee3a2b52fd1f5c7dee380f9c5a99ad35a401fcba5a9117c3860ecec5cb47a92712c6549442fd2fa553a15c5657241dd09f5d00b9ed4f0f4 -SHA512 (Python-3.8.3.tar.xz.asc) = ab39e148475391e4e149ee3a8290e8ba872c758697a4a0b677585875695d107dfcc03a7ab51c5c5f42d65ef779121047a78c61e7789bb1ea7405f9b58aa420f1 +SHA512 (Python-3.8.4rc1.tar.xz) = 8b86a3f79d9343c853ccdde5dba562c32f4cb3e574cbad416998caa39879e72d753036f33ac93e8cd9eb8ade1d685bc1a8fed586521ee5971f34e25cb5b875ad +SHA512 (Python-3.8.4rc1.tar.xz.asc) = 95d1b345f23a185b4ef54c7d12eb209cdc658269d362309fb6f4e76911df8688bd1a37f176b5c41febf675b8198e947dcc4310d017cd2c9c4cd1aba16cb0921b