Skip to content

Commit

Permalink
[3.8] bpo-41490: Bump vendored pip to version 20.2.3 (pythonGH-22527).
Browse files Browse the repository at this point in the history
(cherry picked from commit 2cc6dc9)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
  • Loading branch information
pablogsal committed Oct 4, 2020
1 parent c5f1212 commit 70fa499
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions Lib/ensurepip/__init__.py
Expand Up @@ -4,14 +4,15 @@
import sys
import runpy
import tempfile
import subprocess


__all__ = ["version", "bootstrap"]


_SETUPTOOLS_VERSION = "49.2.1"

_PIP_VERSION = "20.2.1"
_PIP_VERSION = "20.2.3"

_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION, "py3"),
Expand All @@ -20,22 +21,18 @@


def _run_pip(args, additional_paths=None):
# Add our bundled software to the sys.path so we can import it
if additional_paths is not None:
sys.path = additional_paths + sys.path

# Invoke pip as if it's the main module, and catch the exit.
backup_argv = sys.argv[:]
sys.argv[1:] = args
try:
# run_module() alters sys.modules and sys.argv, but restores them at exit
runpy.run_module("pip", run_name="__main__", alter_sys=True)
except SystemExit as exc:
return exc.code
finally:
sys.argv[:] = backup_argv

raise SystemError("pip did not exit, this should never happen")
# Run the bootstraping in a subprocess to avoid leaking any state that happens
# after pip has executed. Particulary, this avoids the case when pip holds onto
# the files in *additional_paths*, preventing us to remove them at the end of the
# invocation.
code = f"""
import runpy
import sys
sys.path = {additional_paths or []} + sys.path
sys.argv[1:] = {args}
runpy.run_module("pip", run_name="__main__", alter_sys=True)
"""
return subprocess.run([sys.executable, "-c", code], check=True).returncode


def version():
Expand Down
Binary file not shown.

0 comments on commit 70fa499

Please sign in to comment.