diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index ca373de..ecf1554 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 21320a8319..dffe4ce389 100644 +index 8f504e7f49..dffe4ce389 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,3 +1,5 @@ @@ -33,10 +33,10 @@ index 21320a8319..dffe4ce389 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/python3.9.spec b/python3.9.spec index 720d2fd..7ac3648 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 b5 +%global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 5%{?dist} +Release: 1%{?dist} License: Python @@ -261,7 +261,7 @@ Patch1: 00001-rpath.patch # See https://bugzilla.redhat.com/show_bug.cgi?id=556092 Patch111: 00111-no-static-lib.patch -# 00189 # da1624564eb80bee8c289bc0dea347774a891a10 +# 00189 # f722680bf606b6b0051e6b4690ce551201382f87 # Instead of bundled wheels, use our RPM packaged wheels # # We keep them in /usr/share/python-wheels @@ -273,8 +273,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 @@ -1634,6 +1634,9 @@ CheckPython optimized # ====================================================== %changelog +* Tue Aug 11 2020 Miro Hrončok - 3.9.0~rc1-1 +- Update to 3.9.0rc1 + * Mon Aug 03 2020 Lumír Balhar - 3.9.0~b5-5 - Add support for upstream architectures' names (patch 353) diff --git a/sources b/sources index 747e5e1..0ba1c12 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.9.0b5.tar.xz) = fd99fe9b3364811512857bcc7963b59b1cf724cbd2174292ba9b16748f1b97949a7d6c5016fb7f4568c366cf9b9fd14d25400773c5240fc31f11086d14e8d3aa -SHA512 (Python-3.9.0b5.tar.xz.asc) = 2e1d89f26a308c021d32913f1793277560a3bc016a1c66e2f186715d76aa6a392ce3842b68dba7497e3aeb609df0c78c9cb8b36b3415bce775fda35841ff2964 +SHA512 (Python-3.9.0rc1.tar.xz) = 8fddf940600bdd4096c0144f689fb9e803bdc7a1ee00f46ccfde3566342ed465c7ac6806613e4f61440fb65f8f83057204bd0dc432ac379759cd4d410c151eef +SHA512 (Python-3.9.0rc1.tar.xz.asc) = ac03f9ab597f6fe6bd135a1481199e8d56bdfcd527fda53619ac0d2bdddff3e66555513bf2739e488682341f7090f16080273498519326d23ec3291ffbf00fcd