From a2f29a3b023a160b089cae7e0d85f2eda9b73fb6 Mon Sep 17 00:00:00 2001 From: Maxim Ermilov Date: Sun, 1 Mar 2020 11:53:14 -0800 Subject: [PATCH 1/2] Add a timeout attribute to pip_import rules --- python/pip.bzl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/pip.bzl b/python/pip.bzl index 237b7d2baa..4499609291 100644 --- a/python/pip.bzl +++ b/python/pip.bzl @@ -29,7 +29,7 @@ def _pip_import_impl(repository_ctx): "--input", repository_ctx.path(repository_ctx.attr.requirements), "--output", repository_ctx.path("requirements.bzl"), "--directory", repository_ctx.path(""), - ]) + ], timeout=repository_ctx.attr.timeout) if result.return_code: fail("pip_import failed: %s (%s)" % (result.stdout, result.stderr)) @@ -41,6 +41,10 @@ pip_import = repository_rule( mandatory = True, single_file = True, ), + "timeout": attr.int( + default = 600, + doc = "Timeout (in seconds) for repository fetch." + ), "_script": attr.label( executable = True, default = Label("//tools:piptool.par"), From 567da2ff7a78f8d46a4e2f3785c2e0c428189ba4 Mon Sep 17 00:00:00 2001 From: Maxim Ermilov Date: Sun, 1 Mar 2020 11:59:09 -0800 Subject: [PATCH 2/2] misc fix --- python/pip.bzl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/pip.bzl b/python/pip.bzl index 4499609291..03fb6919fc 100644 --- a/python/pip.bzl +++ b/python/pip.bzl @@ -37,9 +37,8 @@ def _pip_import_impl(repository_ctx): pip_import = repository_rule( attrs = { "requirements": attr.label( - allow_files = True, mandatory = True, - single_file = True, + allow_single_file = True, ), "timeout": attr.int( default = 600,