e312275dd9
Refreshed Python patches. Updated pip & setuptools version. For pip, patch '001-pep517-pyc-fix.patch' was reworked. Also, the current version of the bundled pip (21.1.1) no longer supports Python2, so the 'py2.py3' suffix gets replaced with just py3. For setuptools, there is no longer a script/module: https://github.com/pypa/setuptools/pull/2544 Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
20 lines
971 B
Diff
20 lines
971 B
Diff
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
|