diff --git a/WORKSPACE b/WORKSPACE index 3bd79f7..89c82a8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,12 +8,13 @@ bazel_skylib_workspace() # and should thus not be included by dependencies on # bazel-skylib. -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -git_repository( +http_archive( name = "io_bazel_skydoc", - commit = "ac5c106412697ffb9364864070bac796b9bb63d3", # Feb 27, 2019 - remote = "https://github.com/bazelbuild/skydoc.git", + url = "https://github.com/bazelbuild/skydoc/archive/0.3.0.tar.gz", + sha256 = "c2d66a0cc7e25d857e480409a8004fdf09072a1bd564d6824441ab2f96448eea", + strip_prefix = "skydoc-0.3.0", ) load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories") diff --git a/lib/selects.bzl b/lib/selects.bzl index eb06098..113e021 100644 --- a/lib/selects.bzl +++ b/lib/selects.bzl @@ -17,13 +17,6 @@ def _with_or(input_dict, no_match_error = ""): """Drop-in replacement for `select()` that supports ORed keys. - Args: - input_dict: The same dictionary `select()` takes, except keys may take - either the usual form `"//foo:config1"` or - `("//foo:config1", "//foo:config2", ...)` to signify - `//foo:config1` OR `//foo:config2` OR `...`. - no_match_error: Optional custom error to report if no condition matches. - Example: ```build @@ -37,6 +30,13 @@ def _with_or(input_dict, no_match_error = ""): Key labels may appear at most once anywhere in the input. + Args: + input_dict: The same dictionary `select()` takes, except keys may take + either the usual form `"//foo:config1"` or + `("//foo:config1", "//foo:config2", ...)` to signify + `//foo:config1` OR `//foo:config2` OR `...`. + no_match_error: Optional custom error to report if no condition matches. + Returns: A native `select()` that expands @@ -79,16 +79,6 @@ def _with_or_dict(input_dict): def _config_setting_group(name, match_any = [], match_all = []): """Matches if all or any of its member `config_setting`s match. - Args: - name: The group's name. This is how `select()`s reference it. - match_any: A list of `config_settings`. This group matches if *any* member - in the list matches. If this is set, `match_all` must not be set. - match_all: A list of `config_settings`. This group matches if *every* - member in the list matches. If this is set, `match_any` must be not - set. - - Exactly one of match_any or match_all must be non-empty. - Example: ```build @@ -109,6 +99,14 @@ def _config_setting_group(name, match_any = [], match_all = []): "//conditions:default": [":default_deps"] }) ``` + + Args: + name: The group's name. This is how `select()`s reference it. + match_any: A list of `config_settings`. This group matches if *any* member + in the list matches. If this is set, `match_all` must not be set. + match_all: A list of `config_settings`. This group matches if *every* + member in the list matches. If this is set, `match_any` must be not + set. """ empty1 = not bool(len(match_any)) empty2 = not bool(len(match_all))