[bootstrap/deps.pyl] Update httplib2 to a modern version.
Also fix build_deps.py to actually work.
R=tandrii@chromium.org
Bug: 1026340
Change-Id: Ifeb78d27039fd8f9dc8bf37b528e4817ef741c00
Reviewed-on: https://chromium-review.googlesource.com/c/infra/infra/+/1954174
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Cr-Commit-Position: refs/heads/master@{#27671}
diff --git a/bootstrap/build_deps.py b/bootstrap/build_deps.py
index 713b596..c4fac14 100755
--- a/bootstrap/build_deps.py
+++ b/bootstrap/build_deps.py
@@ -29,9 +29,10 @@
def pip(*args, **kwargs):
- bin_dir = 'Scripts' if sys.platform.startswith('win') else 'bin'
+ bin_dir = '' if sys.platform.startswith('win') else 'bin'
subprocess.check_call(
- (os.path.join(sys.prefix, bin_dir, 'pip'),) + args, **kwargs)
+ (os.path.join(sys.prefix, bin_dir, 'python'), '-m', 'pip') + args,
+ **kwargs)
def wheel(arg, source_sha, build, build_options):
@@ -109,8 +110,7 @@
with tempname(ext) as tmp:
link = 'file://' + tmp
subprocess.check_call([
- sys.executable, GSUTIL, '--force-version', '4.7', 'cp',
- SOURCE_URL.format(sha_ext), tmp])
+ 'vpython', GSUTIL, 'cp', SOURCE_URL.format(sha_ext), tmp])
with open(tmp, 'rb') as f:
assert hashlib.sha1(f.read()).hexdigest() == sha
if not has_custom_build(name):
diff --git a/bootstrap/deps.pyl b/bootstrap/deps.pyl
index 6b90694..5758dbe 100644
--- a/bootstrap/deps.pyl
+++ b/bootstrap/deps.pyl
@@ -212,11 +212,10 @@
],
'implicit': True, # Required by apache_beam
},
- 'httplib2': {
- 'version': '0.9',
- 'build': '0',
- 'repo': 'external/github.com/jcgregorio/httplib2',
- 'rev': '7d1b88a3cf34774242bf4c0578c09c0092bb05d8',
+ "httplib2": {
+ "build": "0",
+ "gs": "dbdffdcbe920eca7b57ec62671c8be0e68b08ac3.tar.gz",
+ "version": "0.14.0"
},
'idna': {
'version': '2.1',
