From 68997e05e0fb128b12befbb5b4c2a366e8c381ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 6 Oct 2020 08:21:43 +0200 Subject: [PATCH] Update to 3.9.0 final --- 00189-use-rpm-wheels.patch | 10 +++++----- 00353-architecture-names-upstream-downstream.patch | 5 +++++ python3.9.spec | 11 +++++++---- sources | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index ecf1554..cd8a99e 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(+), 11 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py -index 8f504e7f49..dffe4ce389 100644 +index 97dfa7ea71..984e587ea0 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,3 +1,5 @@ @@ -21,8 +21,8 @@ index 8f504e7f49..dffe4ce389 100644 import os import os.path import sys -@@ -5,16 +7,28 @@ import runpy - import tempfile +@@ -6,16 +8,28 @@ import tempfile + import subprocess from importlib import resources -from . import _bundled @@ -36,7 +36,7 @@ index 8f504e7f49..dffe4ce389 100644 -_SETUPTOOLS_VERSION = "49.2.1" +_wheels = {} --_PIP_VERSION = "20.2.1" +-_PIP_VERSION = "20.2.3" +def _get_most_recent_wheel_version(pkg): + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + _wheels[pkg] = {} @@ -54,7 +54,7 @@ index 8f504e7f49..dffe4ce389 100644 _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION, "py3"), -@@ -108,13 +122,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, +@@ -105,13 +119,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, # additional paths that need added to sys.path additional_paths = [] for project, version, py_tag in _PROJECTS: diff --git a/00353-architecture-names-upstream-downstream.patch b/00353-architecture-names-upstream-downstream.patch index 3dee1e6..cc531b9 100644 --- a/00353-architecture-names-upstream-downstream.patch +++ b/00353-architecture-names-upstream-downstream.patch @@ -3,6 +3,9 @@ From: Lumir Balhar Date: Tue, 4 Aug 2020 12:04:03 +0200 Subject: [PATCH] 00353: Original names for architectures with different names downstream +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names @@ -24,6 +27,8 @@ and therefore Python during bootstrap contains importlib from upstream without this feature. It's possible to include Python/importlib_external.h to this patch but it'd make rebasing a nightmare because it's basically a binary file. + +Co-authored-by: Miro Hrončok --- Lib/importlib/_bootstrap_external.py | 40 ++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/python3.9.spec b/python3.9.spec index 8b87906..90ae89b 100644 --- a/python3.9.spec +++ b/python3.9.spec @@ -14,10 +14,10 @@ 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}.0 -%global prerel rc2 +#global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python @@ -287,7 +287,7 @@ Patch1: 00001-rpath.patch # See https://bugzilla.redhat.com/show_bug.cgi?id=556092 Patch111: 00111-no-static-lib.patch -# 00189 # f722680bf606b6b0051e6b4690ce551201382f87 +# 00189 # 7c07eec60735bd65bda7d8e821d34718497cba27 # Instead of bundled wheels, use our RPM packaged wheels # # We keep them in /usr/share/python-wheels @@ -299,7 +299,7 @@ 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.2.1 +%global pip_version 20.2.3 %global setuptools_version 49.2.1 # 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356 @@ -1672,6 +1672,9 @@ CheckPython optimized # ====================================================== %changelog +* Tue Oct 06 2020 Miro Hrončok - 3.9.0-1 +- Update to 3.9.0 final + * Fri Sep 25 2020 Miro Hrončok - 3.9.0~rc2-2 - Use upstream architecture names on Fedora 34+ - https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names diff --git a/sources b/sources index 20fdf94..a4c547e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.9.0rc2.tar.xz) = 77aced89518d86c1fb0e48a96be135c8385f6fb912543f7bb8e792b15ca0d59005269a4c35d4185d31536980572f8fa0adee022a572a268e1f8e9832a052ef5c -SHA512 (Python-3.9.0rc2.tar.xz.asc) = 51d8b6bbcaa9e27e6e023881539726665b05ceeab19ba34f1e9b8eb2a6c8c8a8cdf4c29468d5d8d0618c16a1dc7bfc30ca16a3b60bd5a9c6a6b6e01fba31c5d5 +SHA512 (Python-3.9.0.tar.xz) = b141039c9701a8cb0d15cd11a279153077524af4d0599e7d2c7279d4c18d05fda06b33ef82342d875de996c7117b7dc6eb154dc3669d38a1efa99801aeec6c5e +SHA512 (Python-3.9.0.tar.xz.asc) = 443ea4135cd30bfed7691d81351900f7e3c2620ca86aa19df3a57d283c440947a952e35ce8b4ba48426c128d80a3502276dd4438203eda1b7eda54da95e292a0