diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 09c572d..167d27b 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,16 +1,27 @@ +import distutils.version +import glob import os import os.path -import pkgutil import sys import tempfile __all__ = ["version", "bootstrap"] +_WHEEL_DIR = "/usr/share/python{}-wheels/".format(sys.version_info[0]) -_SETUPTOOLS_VERSION = "40.6.2" +def _get_most_recent_wheel_version(pkg): + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + suffix = "-py2.py3-none-any.whl" + pattern = "{}*{}".format(prefix, suffix) + versions = (p[len(prefix):-len(suffix)] for p in glob.glob(pattern)) + return str(max(versions, key=distutils.version.LooseVersion)) + + +_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools") + +_PIP_VERSION = _get_most_recent_wheel_version("pip") -_PIP_VERSION = "18.1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), @@ -23,9 +34,15 @@ def _run_pip(args, additional_paths=None): if additional_paths is not None: sys.path = additional_paths + sys.path - # Install the bundled software - import pip._internal - return pip._internal.main(args) + try: + # pip 10 + from pip._internal import main + except ImportError: + # pip 9 + from pip import main + if args[0] in ["install", "list", "wheel"]: + args.append('--pre') + return main(args) def version(): @@ -94,12 +111,9 @@ def _bootstrap(*, root=None, upgrade=False, user=False, additional_paths = [] for project, version in _PROJECTS: wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) - whl = pkgutil.get_data( - "ensurepip", - "_bundled/{}".format(wheel_name), - ) - with open(os.path.join(tmpdir, wheel_name), "wb") as fp: - fp.write(whl) + with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp: + with open(os.path.join(tmpdir, wheel_name), "wb") as fp: + fp.write(sfp.read()) additional_paths.append(os.path.join(tmpdir, wheel_name))