Update to 3.9.11

This commit is contained in:
Tomáš Hrnčiar 2022-03-17 15:55:45 +01:00
parent 519e7eee12
commit d899219223
4 changed files with 15 additions and 12 deletions

View File

@ -12,7 +12,7 @@ We might eventually pursuit upstream support, but it's low prio
1 file changed, 26 insertions(+), 11 deletions(-) 1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 2a140a2624..5bd16a6c59 100644 index e510cc7fb2..5bd16a6c59 100644
--- a/Lib/ensurepip/__init__.py --- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
@ -31,7 +31,7 @@ index 2a140a2624..5bd16a6c59 100644
__all__ = ["version", "bootstrap"] __all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "58.1.0" -_SETUPTOOLS_VERSION = "58.1.0"
-_PIP_VERSION = "21.2.4" -_PIP_VERSION = "22.0.4"
+ +
+_WHEEL_DIR = "/usr/share/python-wheels/" +_WHEEL_DIR = "/usr/share/python-wheels/"
+ +

View File

@ -34,10 +34,10 @@ Co-authored-by: Miro Hrončok <miro@hroncok.cz>
1 file changed, 38 insertions(+), 2 deletions(-) 1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index fe31f437da..b5b70757f0 100644 index f3828b10e1..f0c9f8e383 100644
--- a/Lib/importlib/_bootstrap_external.py --- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py
@@ -1636,7 +1636,7 @@ def _get_supported_file_loaders(): @@ -1645,7 +1645,7 @@ def _get_supported_file_loaders():
Each item is a tuple (loader, suffixes). Each item is a tuple (loader, suffixes).
""" """
@ -46,7 +46,7 @@ index fe31f437da..b5b70757f0 100644
source = SourceFileLoader, SOURCE_SUFFIXES source = SourceFileLoader, SOURCE_SUFFIXES
bytecode = SourcelessFileLoader, BYTECODE_SUFFIXES bytecode = SourcelessFileLoader, BYTECODE_SUFFIXES
return [extensions, source, bytecode] return [extensions, source, bytecode]
@@ -1692,7 +1692,7 @@ def _setup(_bootstrap_module): @@ -1701,7 +1701,7 @@ def _setup(_bootstrap_module):
# Constants # Constants
setattr(self_module, '_relax_case', _make_relax_case()) setattr(self_module, '_relax_case', _make_relax_case())
@ -55,7 +55,7 @@ index fe31f437da..b5b70757f0 100644
if builtin_os == 'nt': if builtin_os == 'nt':
SOURCE_SUFFIXES.append('.pyw') SOURCE_SUFFIXES.append('.pyw')
if '_d.pyd' in EXTENSION_SUFFIXES: if '_d.pyd' in EXTENSION_SUFFIXES:
@@ -1705,3 +1705,39 @@ def _install(_bootstrap_module): @@ -1714,3 +1714,39 @@ def _install(_bootstrap_module):
supported_loaders = _get_supported_file_loaders() supported_loaders = _get_supported_file_loaders()
sys.path_hooks.extend([FileFinder.path_hook(*supported_loaders)]) sys.path_hooks.extend([FileFinder.path_hook(*supported_loaders)])
sys.meta_path.append(PathFinder) sys.meta_path.append(PathFinder)

View File

@ -13,11 +13,11 @@ URL: https://www.python.org/
# WARNING When rebasing to a new Python version, # WARNING When rebasing to a new Python version,
# remember to update the python3-docs package as well # remember to update the python3-docs package as well
%global general_version %{pybasever}.10 %global general_version %{pybasever}.11
#global prerel ... #global prerel ...
%global upstream_version %{general_version}%{?prerel} %global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}} Version: %{general_version}%{?prerel:~%{prerel}}
Release: 3%{?dist} Release: 1%{?dist}
License: Python License: Python
@ -305,7 +305,7 @@ Patch1: 00001-rpath.patch
# See https://bugzilla.redhat.com/show_bug.cgi?id=556092 # See https://bugzilla.redhat.com/show_bug.cgi?id=556092
Patch111: 00111-no-static-lib.patch Patch111: 00111-no-static-lib.patch
# 00189 # d06cf137c00fd3907b436fdb92a8f007a7f2fb50 # 00189 # a79a85be3f0ad45792d998aed1104c2c2a0ef729
# Instead of bundled wheels, use our RPM packaged wheels # Instead of bundled wheels, use our RPM packaged wheels
# #
# We keep them in /usr/share/python-wheels # We keep them in /usr/share/python-wheels
@ -317,7 +317,7 @@ Patch189: 00189-use-rpm-wheels.patch
# The versions are written in Lib/ensurepip/__init__.py, this patch removes them. # 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. # 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: # In such cases, the patch needs to be amended and the versions updated here:
%global pip_version 21.2.4 %global pip_version 22.0.4
%global setuptools_version 58.1.0 %global setuptools_version 58.1.0
# 00251 # 1b1047c14ff98eae6d355b4aac4df3e388813f62 # 00251 # 1b1047c14ff98eae6d355b4aac4df3e388813f62
@ -1805,6 +1805,9 @@ CheckPython optimized
# ====================================================== # ======================================================
%changelog %changelog
* Thu Mar 17 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.9.11-1
- Update to 3.9.11
* Wed Mar 16 2022 Karolina Surma <ksurma@redhat.com> - 3.9.10-3 * Wed Mar 16 2022 Karolina Surma <ksurma@redhat.com> - 3.9.10-3
- Fix the test suite support for setuptools >= 60 - Fix the test suite support for setuptools >= 60
Resolves: rhbz#2064734 Resolves: rhbz#2064734

View File

@ -1,2 +1,2 @@
SHA512 (Python-3.9.10.tar.xz) = 09cb942f84bf362df88999ffa6faf89b4ad12302e67cda4a11547828ebe410c7c93a3dc96cd66fd9c5c7d9a1abe5b8e259e7ec47c10273b42d212270aca5ecba SHA512 (Python-3.9.11.tar.xz) = 804e6e6b31922378f07f290023f6efc870c6fd3010204c499c2b375880f6e6ec0f72ce96a8fff81956f6fa3bea2123df2138ef0fda23a3d5d3cf757174a930c3
SHA512 (Python-3.9.10.tar.xz.asc) = d9fed5b39100b81835085d712453516d309b0dddc1524d578cb63c95cd1e2392882702111dd3cb0ebf58c98b94ec04838c89c57f4a7a649c585f7ba5eef70e5e SHA512 (Python-3.9.11.tar.xz.asc) = a84bbfa68ec1c0e45bbd64af4481be7d68885021287731c69346a3cb25c9bf607be84dd72af2d3a6fbeabbde64975f37c4bb4f61274e72b92b4277fa48543e52