Merge pull request #21348 from jefferyto/python-3.7.17-openwrt-19.07openwrt-19.07

[openwrt-19.07] python3: Update to 3.7.17

4 files changed, 23 insertions, 23 deletions

diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk
index a51b1dce2..545435904 100644
--- a/lang/python/python3-version.mk
+++ b/lang/python/python3-version.mk
@@ -8,7 +8,7 @@
 # Note: keep in sync with setuptools & pip
 PYTHON3_VERSION_MAJOR:=3
 PYTHON3_VERSION_MINOR:=7
-PYTHON3_VERSION_MICRO:=16
+PYTHON3_VERSION_MICRO:=17
 
 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
 
@@ -16,4 +16,4 @@ PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
 PYTHON3_PIP_PKG_RELEASE:=1
 
 PYTHON3_SETUPTOOLS_VERSION:=47.1.0
-PYTHON3_PIP_VERSION:=22.0.4
+PYTHON3_PIP_VERSION:=23.0.1
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index a4d25c4aa..0fdc8e503 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -19,7 +19,7 @@ PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_HASH:=8338f0c2222d847e904c955369155dc1beeeed806e8d5ef04b00ef4787238bfd
+PKG_HASH:=7911051ed0422fd54b8f59ffc030f7cf2ae30e0f61bda191800bb040dce4f9d2
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=Python/2.0
diff --git a/lang/python/python3/patches-pip/001-pep517-pyc-fix.patch b/lang/python/python3/patches-pip/001-pep517-pyc-fix.patch
deleted file mode 100644
index e600b0a30..000000000
--- a/lang/python/python3/patches-pip/001-pep517-pyc-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/pip/_vendor/pep517/in_process/__init__.py b/pip/_vendor/pep517/in_process/__init__.py
-index c932313..a01143b 100644
---- a/pip/_vendor/pep517/in_process/__init__.py
-+++ b/pip/_vendor/pep517/in_process/__init__.py
-@@ -10,8 +10,13 @@ try:
-     import importlib.resources as resources
- 
-     def _in_proc_script_path():
--        return resources.path(__package__, '_in_process.py')
-+        if resources.is_resource(__package__, '_in_process.py'):
-+            return resources.path(__package__, '_in_process.py')
-+        return resources.path(__package__, '_in_process.pyc')
- except ImportError:
-     @contextmanager
-     def _in_proc_script_path():
--        yield pjoin(dirname(abspath(__file__)), '_in_process.py')
-+        _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.py')
-+        if not os.path.isfile(_in_proc_script):
-+            _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.pyc')
-+        yield _in_proc_script
diff --git a/lang/python/python3/patches-pip/001-pyproject-hooks-pyc-fix.patch b/lang/python/python3/patches-pip/001-pyproject-hooks-pyc-fix.patch
new file mode 100644
index 000000000..72f6896f3
--- /dev/null
+++ b/lang/python/python3/patches-pip/001-pyproject-hooks-pyc-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/pip/_vendor/pyproject_hooks/_in_process/__init__.py b/pip/_vendor/pyproject_hooks/_in_process/__init__.py
+index 917fa065b3c7..c9ec8efd53b3 100644
+--- a/pip/_vendor/pyproject_hooks/_in_process/__init__.py
++++ b/pip/_vendor/pyproject_hooks/_in_process/__init__.py
+@@ -11,8 +11,13 @@ try:
+ except AttributeError:
+     # Python 3.8 compatibility
+     def _in_proc_script_path():
+-        return resources.path(__package__, '_in_process.py')
++        if resources.is_resource(__package__, '_in_process.py'):
++            return resources.path(__package__, '_in_process.py')
++        return resources.path(__package__, '_in_process.pyc')
+ else:
+     def _in_proc_script_path():
++        if resources.files(__package__).joinpath('_in_process.py').is_file():
++            return resources.as_file(
++                resources.files(__package__).joinpath('_in_process.py'))
+         return resources.as_file(
+-            resources.files(__package__).joinpath('_in_process.py'))
++            resources.files(__package__).joinpath('_in_process.pyc'))