From 1c052f5a121b5335d74664bfcb171a4368cc1430 Mon Sep 17 00:00:00 2001 From: Ignas Anikevicius Date: Wed, 17 May 2023 09:18:58 +0900 Subject: [PATCH 1/2] refactor(toolchain): rename variable url -> urls --- python/repositories.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/repositories.bzl b/python/repositories.bzl index 2429d7e026..93cd48f542 100644 --- a/python/repositories.bzl +++ b/python/repositories.bzl @@ -106,11 +106,11 @@ def _python_repository_impl(rctx): python_version = rctx.attr.python_version python_short_version = python_version.rpartition(".")[0] release_filename = rctx.attr.release_filename - url = rctx.attr.urls or [rctx.attr.url] + urls = rctx.attr.urls or [rctx.attr.url] if release_filename.endswith(".zst"): rctx.download( - url = url, + url = urls, sha256 = rctx.attr.sha256, output = release_filename, ) @@ -153,7 +153,7 @@ def _python_repository_impl(rctx): fail(fail_msg) else: rctx.download_and_extract( - url = url, + url = urls, sha256 = rctx.attr.sha256, stripPrefix = rctx.attr.strip_prefix, ) @@ -360,7 +360,7 @@ py_runtime_pair( "release_filename": release_filename, "sha256": rctx.attr.sha256, "strip_prefix": rctx.attr.strip_prefix, - "url": url, + "url": urls, } python_repository = repository_rule( From e13ab772b79cdfd5083259508201ac7f61f81de1 Mon Sep 17 00:00:00 2001 From: Ignas Anikevicius Date: Wed, 17 May 2023 09:22:21 +0900 Subject: [PATCH 2/2] fix(toolchain): set url return attrs correctly --- python/repositories.bzl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python/repositories.bzl b/python/repositories.bzl index 93cd48f542..358df4341b 100644 --- a/python/repositories.bzl +++ b/python/repositories.bzl @@ -348,7 +348,7 @@ py_runtime_pair( rctx.file(STANDALONE_INTERPRETER_FILENAME, "# File intentionally left blank. Indicates that this is an interpreter repo created by rules_python.") rctx.file("BUILD.bazel", build_content) - return { + attrs = { "coverage_tool": rctx.attr.coverage_tool, "distutils": rctx.attr.distutils, "distutils_content": rctx.attr.distutils_content, @@ -360,9 +360,15 @@ py_runtime_pair( "release_filename": release_filename, "sha256": rctx.attr.sha256, "strip_prefix": rctx.attr.strip_prefix, - "url": urls, } + if rctx.attr.url: + attrs["url"] = rctx.attr.url + else: + attrs["urls"] = urls + + return attrs + python_repository = repository_rule( _python_repository_impl, doc = "Fetches the external tools needed for the Python toolchain.",