diff options
| author | Pradyun S. Gedam <pradyunsg@users.noreply.github.com> | 2017-08-03 03:20:45 +0530 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2017-08-02 17:50:45 -0400 |
| commit | 281061fca74ff0f64e9d17f51255c02d2c4f1fe2 (patch) | |
| tree | a2254260c3ce76ad1a41fd9b16da92ea399dbdcc /tasks | |
| parent | 3de4464fab340d78e43ea980b621f6f6cada7b42 (diff) | |
| download | pip-281061fca74ff0f64e9d17f51255c02d2c4f1fe2.tar.gz | |
Upgrade some vendored dependencies (#4638)
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/vendoring/__init__.py | 4 | ||||
| -rw-r--r-- | tasks/vendoring/patches/pkg_resources.patch | 21 |
2 files changed, 3 insertions, 22 deletions
diff --git a/tasks/vendoring/__init__.py b/tasks/vendoring/__init__.py index f0bae7f01..c88e97d1d 100644 --- a/tasks/vendoring/__init__.py +++ b/tasks/vendoring/__init__.py @@ -74,7 +74,7 @@ def rewrite_file_imports(item, vendored_libs): def apply_patch(ctx, patch_file_path): log('Applying patch %s' % patch_file_path.name) - ctx.run('git apply %s' % patch_file_path) + ctx.run('git apply --verbose %s' % patch_file_path) def vendor(ctx, vendor_dir): @@ -90,6 +90,8 @@ def vendor(ctx, vendor_dir): # Cleanup setuptools unneeded parts (vendor_dir / 'easy_install.py').unlink() drop_dir(vendor_dir / 'setuptools') + drop_dir(vendor_dir / 'pkg_resources' / '_vendor') + drop_dir(vendor_dir / 'pkg_resources' / 'extern') # Drop interpreter and OS specific msgpack libs. # Pip will rely on the python-only fallback instead. diff --git a/tasks/vendoring/patches/pkg_resources.patch b/tasks/vendoring/patches/pkg_resources.patch deleted file mode 100644 index bce7cb620..000000000 --- a/tasks/vendoring/patches/pkg_resources.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/pip/_vendor/pkg_resources/__init__.py b/pip/_vendor/pkg_resources/__init__.py -index 62116a88..b4bf0cae 100644 ---- a/pip/_vendor/pkg_resources/__init__.py -+++ b/pip/_vendor/pkg_resources/__init__.py -@@ -67,11 +67,12 @@ try: - except ImportError: - importlib_machinery = None - --import packaging.version --import packaging.specifiers --import packaging.requirements --import packaging.markers - from pip._vendor import appdirs -+from pip._vendor import packaging -+__import__('pip._vendor.packaging.version') -+__import__('pip._vendor.packaging.specifiers') -+__import__('pip._vendor.packaging.requirements') -+__import__('pip._vendor.packaging.markers') - - if (3, 0) < sys.version_info < (3, 3): - raise RuntimeError("Python 3.3 or later is required") |