update version 3.8.5

This commit is contained in:
zhanliwen 2020-08-01 14:09:14 +08:00
parent f9559d7e4d
commit a233249294
4 changed files with 1988 additions and 15 deletions

View File

@ -1,5 +1,18 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 15 Aug 2018 15:36:29 +0200
Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
We keep them in /usr/share/python-wheels
Downstream only: upstream bundles
We might eventually pursuit upstream support, but it's low prio
---
Lib/ensurepip/__init__.py | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 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 4748ba4..fc02255 100644 index f3152a55d4..f58dab1800 100644
--- a/Lib/ensurepip/__init__.py --- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
@ -12,15 +25,15 @@ index 4748ba4..fc02255 100644
import runpy import runpy
import tempfile import tempfile
@@ -8,10 +9,24 @@ import tempfile @@ -8,10 +9,24 @@ import tempfile
__all__ = ["version", "bootstrap"] __all__ = ["version", "bootstrap"]
+_WHEEL_DIR = "/usr/share/python-wheels/" +_WHEEL_DIR = "/usr/share/python-wheels/"
-_SETUPTOOLS_VERSION = "41.2.0" -_SETUPTOOLS_VERSION = "47.1.0"
+_wheels = {} +_wheels = {}
-_PIP_VERSION = "19.2.3" -_PIP_VERSION = "20.1.1"
+def _get_most_recent_wheel_version(pkg): +def _get_most_recent_wheel_version(pkg):
+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
+ _wheels[pkg] = {} + _wheels[pkg] = {}
@ -35,14 +48,14 @@ index 4748ba4..fc02255 100644
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools") +_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
+ +
+_PIP_VERSION = _get_most_recent_wheel_version("pip") +_PIP_VERSION = _get_most_recent_wheel_version("pip")
_PROJECTS = [ _PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION), ("setuptools", _SETUPTOOLS_VERSION, "py3"),
@@ -105,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, @@ -105,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# additional paths that need added to sys.path # additional paths that need added to sys.path
additional_paths = [] additional_paths = []
for project, version in _PROJECTS: for project, version, py_tag in _PROJECTS:
- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) - wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
- whl = pkgutil.get_data( - whl = pkgutil.get_data(
- "ensurepip", - "ensurepip",
- "_bundled/{}".format(wheel_name), - "_bundled/{}".format(wheel_name),
@ -53,6 +66,6 @@ index 4748ba4..fc02255 100644
+ with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp: + with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:
+ with open(os.path.join(tmpdir, wheel_name), "wb") as fp: + with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
+ fp.write(sfp.read()) + fp.write(sfp.read())
additional_paths.append(os.path.join(tmpdir, wheel_name)) additional_paths.append(os.path.join(tmpdir, wheel_name))

1955
python-385 Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@ Name: python3
Summary: Interpreter of the Python3 programming language Summary: Interpreter of the Python3 programming language
URL: https://www.python.org/ URL: https://www.python.org/
Version: 3.8.3 Version: 3.8.5
Release: 1 Release: 1
License: Python License: Python
@ -392,7 +392,6 @@ LD_LIBRARY_PATH=$(pwd)/build/debug $(pwd)/build/debug/python -m test.regrtest \
-x test_asyncio -x test_asyncio
export OPENSSL_CONF=/non-existing-file export OPENSSL_CONF=/non-existing-file
LD_LIBRARY_PATH=$(pwd)/build/optimized $(pwd)/build/optimized/python -m test.pythoninfo LD_LIBRARY_PATH=$(pwd)/build/optimized $(pwd)/build/optimized/python -m test.pythoninfo
WITHIN_PYTHON_RPM_BUILD= \ WITHIN_PYTHON_RPM_BUILD= \
@ -789,6 +788,12 @@ export BEP_GTDLIST="$BEP_GTDLIST_TMP"
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Sat Aug 1 2020 wenzhanli<wenzhanli2@huawei.com> - 3.8.5-1
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:update version 3.8.5
* Fri Jun 5 2020 hanxinke<hanxinke@huawei.com> - 3.8.3-1 * Fri Jun 5 2020 hanxinke<hanxinke@huawei.com> - 3.8.3-1
- Update to Python 3.8.3 - Update to Python 3.8.3