diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index 522ac6a..425decb 100644 --- a/00189-use-rpm-wheels.patch +++ b/00189-use-rpm-wheels.patch @@ -12,7 +12,7 @@ We might eventually pursuit upstream support, but it's low prio 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py -index f3152a55d4..f58dab1800 100644 +index 9415fd73b8..f58dab1800 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,6 +1,7 @@ @@ -30,10 +30,10 @@ index f3152a55d4..f58dab1800 100644 +_WHEEL_DIR = "/usr/share/python-wheels/" --_SETUPTOOLS_VERSION = "47.1.0" +-_SETUPTOOLS_VERSION = "49.2.1" +_wheels = {} --_PIP_VERSION = "20.1.1" +-_PIP_VERSION = "20.2.1" +def _get_most_recent_wheel_version(pkg): + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + _wheels[pkg] = {} diff --git a/00328-pyc-timestamp-invalidation-mode.patch b/00328-pyc-timestamp-invalidation-mode.patch index 9708b15..fbe9ed5 100644 --- a/00328-pyc-timestamp-invalidation-mode.patch +++ b/00328-pyc-timestamp-invalidation-mode.patch @@ -19,7 +19,7 @@ Ideally, we should talk to upstream and explain why we don't want this 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/py_compile.py b/Lib/py_compile.py -index 21736896af..310bed5620 100644 +index a81f493731..bba3642bf2 100644 --- a/Lib/py_compile.py +++ b/Lib/py_compile.py @@ -70,7 +70,8 @@ class PycInvalidationMode(enum.Enum): @@ -33,10 +33,10 @@ index 21736896af..310bed5620 100644 else: return PycInvalidationMode.TIMESTAMP diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py -index d4a68c9320..ed09874023 100644 +index e6791c6916..b2d3dcf7fb 100644 --- a/Lib/test/test_py_compile.py +++ b/Lib/test/test_py_compile.py -@@ -17,6 +17,7 @@ def without_source_date_epoch(fxn): +@@ -19,6 +19,7 @@ def without_source_date_epoch(fxn): def wrapper(*args, **kwargs): with support.EnvironmentVarGuard() as env: env.unset('SOURCE_DATE_EPOCH') @@ -44,7 +44,7 @@ index d4a68c9320..ed09874023 100644 return fxn(*args, **kwargs) return wrapper -@@ -27,6 +28,7 @@ def with_source_date_epoch(fxn): +@@ -29,6 +30,7 @@ def with_source_date_epoch(fxn): def wrapper(*args, **kwargs): with support.EnvironmentVarGuard() as env: env['SOURCE_DATE_EPOCH'] = '123456789' diff --git a/00353-Original-names-for-architectures-with-different-name.patch b/00353-Original-names-for-architectures-with-different-name.patch index d3b1a28..7464fb1 100644 --- a/00353-Original-names-for-architectures-with-different-name.patch +++ b/00353-Original-names-for-architectures-with-different-name.patch @@ -25,10 +25,10 @@ a nightmare because it's basically a binary file. 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 25a3f8c0e0..db4bb4d02d 100644 +index b8ac482994..3a97be9dcb 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -1566,7 +1566,7 @@ def _get_supported_file_loaders(): +@@ -1559,7 +1559,7 @@ def _get_supported_file_loaders(): Each item is a tuple (loader, suffixes). """ @@ -37,7 +37,7 @@ index 25a3f8c0e0..db4bb4d02d 100644 source = SourceFileLoader, SOURCE_SUFFIXES bytecode = SourcelessFileLoader, BYTECODE_SUFFIXES return [extensions, source, bytecode] -@@ -1622,7 +1622,7 @@ def _setup(_bootstrap_module): +@@ -1623,7 +1623,7 @@ def _setup(_bootstrap_module): # Constants setattr(self_module, '_relax_case', _make_relax_case()) @@ -46,7 +46,7 @@ index 25a3f8c0e0..db4bb4d02d 100644 if builtin_os == 'nt': SOURCE_SUFFIXES.append('.pyw') if '_d.pyd' in EXTENSION_SUFFIXES: -@@ -1635,3 +1635,30 @@ def _install(_bootstrap_module): +@@ -1636,3 +1636,30 @@ def _install(_bootstrap_module): supported_loaders = _get_supported_file_loaders() sys.path_hooks.extend([FileFinder.path_hook(*supported_loaders)]) sys.meta_path.append(PathFinder) diff --git a/python3.spec b/python3.spec index 3e143cd..6a4034f 100644 --- a/python3.spec +++ b/python3.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}.5 -#global prerel rc1 +%global general_version %{pybasever}.6 +%global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 5%{?dist} +Release: 1%{?dist} License: Python @@ -249,7 +249,7 @@ Patch102: 00102-lib64.patch # See https://bugzilla.redhat.com/show_bug.cgi?id=556092 Patch111: 00111-no-static-lib.patch -# 00189 # adf51ed04ac74fd6fc39c642af35b87680c71dab +# 00189 # 13b857596e747720f927b7fd829aba50e79b29dd # Instead of bundled wheels, use our RPM packaged wheels # # We keep them in /usr/share/python-wheels @@ -261,8 +261,8 @@ Patch189: 00189-use-rpm-wheels.patch # The versions are written in Lib/ensurepip/__init__.py, this patch removes them. # When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly. # In such cases, the patch needs to be amended and the versions updated here: -%global pip_version 20.1.1 -%global setuptools_version 47.1.0 +%global pip_version 20.2.1 +%global setuptools_version 49.2.1 # 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356 # Change user install location @@ -1604,6 +1604,9 @@ CheckPython optimized # ====================================================== %changelog +* Wed Sep 09 2020 Tomas Hrnciar - 3.8.6~rc1-1 +- Update to 3.8.6rc1 + * Wed Aug 12 2020 Petr Viktorin - 3.8.5-5 - In sys.version and initial REPL message, list the source commit as "default" diff --git a/sources b/sources index 73bda1e..c817d8b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.8.5.tar.xz) = 460cee65d7df7150694590575502d7f22e548ebfc99c8f8b363eef8bf30ee72e58d8ffacb1d607824f877f880eb9fd6775a508388029583e1e1df3380f3f9587 -SHA512 (Python-3.8.5.tar.xz.asc) = 9da94822cc4745176bae78220eef14322967613b7c594980a5f1e15b07d6549edf26c8ce9adf56ca14565108591db1e33827d7d5fd245435c44f839dca9f2fa4 +SHA512 (Python-3.8.6rc1.tar.xz) = 0d3b249fee7a51341b576548257d6c3031f77eda78ebf205b307946633376fc45a7dc633202ed994cdf67d42ef96a37a8af1bf7940baf1b255dee9fbb5a14dc7 +SHA512 (Python-3.8.6rc1.tar.xz.asc) = 5baafd64314b40e8d9dafc5237db70b9c69315043152ba1ffb876307ad437a495e566c4d63df290406f1c8eb94bf75cc7dea0cca4309accba4b476058c26fd4f