|
| 1 | +diff -Nur Python-2.7.9/Lib/ensurepip/__init__.py Python-2.7.9-rewheel/Lib/ensurepip/__init__.py |
| 2 | +--- Python-2.7.9/Lib/ensurepip/__init__.py 2014-08-21 10:49:30.792695824 +0200 |
| 3 | ++++ Python-2.7.9-rewheel/Lib/ensurepip/__init__.py 2014-08-21 10:10:41.958341726 +0200 |
| 4 | +@@ -7,6 +7,7 @@ import pkgutil |
| 5 | + import shutil |
| 6 | + import sys |
| 7 | + import tempfile |
| 8 | ++from ensurepip import rewheel |
| 9 | + |
| 10 | + |
| 11 | + __all__ = ["version", "bootstrap"] |
| 12 | +@@ -43,6 +44,8 @@ |
| 13 | + |
| 14 | + # Install the bundled software |
| 15 | + import pip |
| 16 | ++ if args[0] in ["install", "list", "wheel"]: |
| 17 | ++ args.append('--pre') |
| 18 | + pip.main(args) |
| 19 | + |
| 20 | + |
| 21 | +@@ -93,21 +96,40 @@ def bootstrap(root=None, upgrade=False, |
| 22 | + # omit pip and easy_install |
| 23 | + os.environ["ENSUREPIP_OPTIONS"] = "install" |
| 24 | + |
| 25 | ++ whls = [] |
| 26 | ++ rewheel_dir = None |
| 27 | ++ # try to see if we have system-wide versions of _PROJECTS |
| 28 | ++ dep_records = rewheel.find_system_records([p[0] for p in _PROJECTS]) |
| 29 | ++ # TODO: check if system-wide versions are the newest ones |
| 30 | ++ # if --upgrade is used? |
| 31 | ++ if all(dep_records): |
| 32 | ++ # if we have all _PROJECTS installed system-wide, we'll recreate |
| 33 | ++ # wheels from them and install those |
| 34 | ++ rewheel_dir = tempfile.TemporaryDirectory() |
| 35 | ++ for dr in dep_records: |
| 36 | ++ new_whl = rewheel.rewheel_from_record(dr, rewheel_dir.name) |
| 37 | ++ whls.append(os.path.join(rewheel_dir.name, new_whl)) |
| 38 | ++ else: |
| 39 | ++ # if we don't have all the _PROJECTS installed system-wide, |
| 40 | ++ # let's just fall back to bundled wheels |
| 41 | ++ for project, version in _PROJECTS: |
| 42 | ++ whl = os.path.join( |
| 43 | ++ os.path.dirname(__file__), |
| 44 | ++ "_bundled", |
| 45 | ++ "{}-{}-py2.py3-none-any.whl".format(project, version) |
| 46 | ++ ) |
| 47 | ++ whls.append(whl) |
| 48 | ++ |
| 49 | + tmpdir = tempfile.mkdtemp() |
| 50 | + try: |
| 51 | + # Put our bundled wheels into a temporary directory and construct the |
| 52 | + # additional paths that need added to sys.path |
| 53 | + additional_paths = [] |
| 54 | +- for project, version in _PROJECTS: |
| 55 | +- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) |
| 56 | +- whl = pkgutil.get_data( |
| 57 | +- "ensurepip", |
| 58 | +- "_bundled/{}".format(wheel_name), |
| 59 | +- ) |
| 60 | +- with open(os.path.join(tmpdir, wheel_name), "wb") as fp: |
| 61 | +- fp.write(whl) |
| 62 | +- |
| 63 | +- additional_paths.append(os.path.join(tmpdir, wheel_name)) |
| 64 | ++ for whl in whls: |
| 65 | ++ shutil.copy(whl, tmpdir) |
| 66 | ++ additional_paths.append(os.path.join(tmpdir, os.path.basename(whl))) |
| 67 | ++ if rewheel_dir: |
| 68 | ++ rewheel_dir.cleanup() |
| 69 | + |
| 70 | + # Construct the arguments to be passed to the pip command |
| 71 | + args = ["install", "--no-index", "--find-links", tmpdir] |
| 72 | +diff -Nur Python-2.7.9/Makefile.pre.in Python-2.7.9-rewheel/Makefile.pre.in |
| 73 | +--- Python-2.7.9/Makefile.pre.in 2014-08-21 10:49:31.512695040 +0200 |
| 74 | ++++ Python-2.7.9-rewheel/Makefile.pre.in 2014-08-21 10:10:41.961341722 +0200 |
| 75 | +@@ -976,7 +976,7 @@ LIBSUBDIRS= lib-tk lib-tk/test lib-tk/te |
| 76 | + test/tracedmodules \ |
| 77 | + encodings compiler hotshot \ |
| 78 | + email email/mime email/test email/test/data \ |
| 79 | +- ensurepip ensurepip/_bundled \ |
| 80 | ++ ensurepip ensurepip/_bundled ensurepip/rewheel\ |
| 81 | + json json/tests \ |
| 82 | + sqlite3 sqlite3/test \ |
| 83 | + logging bsddb bsddb/test csv importlib wsgiref \ |
0 commit comments