Call py_requirement with named argument for optional kwarg.

PiperOrigin-RevId: 294930818
This commit is contained in:
gVisor bot
2020-02-13 09:21:39 -08:00
parent cf1e50a809
commit 3ad6d30563
12 changed files with 172 additions and 122 deletions
+14
View File
@@ -0,0 +1,14 @@
"""Provides attributes common to many workload tests."""
load("//tools:defs.bzl", "py_requirement")
test_deps = [
py_requirement("attrs", direct = False),
py_requirement("atomicwrites", direct = False),
py_requirement("more-itertools", direct = False),
py_requirement("pathlib2", direct = False),
py_requirement("pluggy", direct = False),
py_requirement("py", direct = False),
py_requirement("pytest"),
py_requirement("six", direct = False),
]
+127 -38
View File
@@ -1,5 +1,4 @@
load("//tools:defs.bzl", "pkg_tar")
load("//tools:defs.bzl", "py_library", "py_requirement")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -46,16 +45,43 @@ py_library(
srcs = ["container.py"],
deps = [
"//benchmarks/workloads",
py_requirement("asn1crypto", False),
py_requirement("chardet", False),
py_requirement("certifi", False),
py_requirement("docker", True),
py_requirement("docker-pycreds", False),
py_requirement("idna", False),
py_requirement("ptyprocess", False),
py_requirement("requests", False),
py_requirement("urllib3", False),
py_requirement("websocket-client", False),
py_requirement(
"asn1crypto",
direct = False,
),
py_requirement(
"chardet",
direct = False,
),
py_requirement(
"certifi",
direct = False,
),
py_requirement("docker"),
py_requirement(
"docker-pycreds",
direct = False,
),
py_requirement(
"idna",
direct = False,
),
py_requirement(
"ptyprocess",
direct = False,
),
py_requirement(
"requests",
direct = False,
),
py_requirement(
"urllib3",
direct = False,
),
py_requirement(
"websocket-client",
direct = False,
),
],
)
@@ -68,17 +94,47 @@ py_library(
"//benchmarks/harness:ssh_connection",
"//benchmarks/harness:tunnel_dispatcher",
"//benchmarks/harness/machine_mocks",
py_requirement("asn1crypto", False),
py_requirement("chardet", False),
py_requirement("certifi", False),
py_requirement("docker", True),
py_requirement("docker-pycreds", False),
py_requirement("idna", False),
py_requirement("ptyprocess", False),
py_requirement("requests", False),
py_requirement("six", False),
py_requirement("urllib3", False),
py_requirement("websocket-client", False),
py_requirement(
"asn1crypto",
direct = False,
),
py_requirement(
"chardet",
direct = False,
),
py_requirement(
"certifi",
direct = False,
),
py_requirement("docker"),
py_requirement(
"docker-pycreds",
direct = False,
),
py_requirement(
"idna",
direct = False,
),
py_requirement(
"ptyprocess",
direct = False,
),
py_requirement(
"requests",
direct = False,
),
py_requirement(
"six",
direct = False,
),
py_requirement(
"urllib3",
direct = False,
),
py_requirement(
"websocket-client",
direct = False,
),
],
)
@@ -87,10 +143,16 @@ py_library(
srcs = ["ssh_connection.py"],
deps = [
"//benchmarks/harness",
py_requirement("bcrypt", False),
py_requirement("cffi", True),
py_requirement("paramiko", True),
py_requirement("cryptography", False),
py_requirement(
"bcrypt",
direct = False,
),
py_requirement("cffi"),
py_requirement("paramiko"),
py_requirement(
"cryptography",
direct = False,
),
],
)
@@ -98,16 +160,43 @@ py_library(
name = "tunnel_dispatcher",
srcs = ["tunnel_dispatcher.py"],
deps = [
py_requirement("asn1crypto", False),
py_requirement("chardet", False),
py_requirement("certifi", False),
py_requirement("docker", True),
py_requirement("docker-pycreds", False),
py_requirement("idna", False),
py_requirement("pexpect", True),
py_requirement("ptyprocess", False),
py_requirement("requests", False),
py_requirement("urllib3", False),
py_requirement("websocket-client", False),
py_requirement(
"asn1crypto",
direct = False,
),
py_requirement(
"chardet",
direct = False,
),
py_requirement(
"certifi",
direct = False,
),
py_requirement("docker"),
py_requirement(
"docker-pycreds",
direct = False,
),
py_requirement(
"idna",
direct = False,
),
py_requirement("pexpect"),
py_requirement(
"ptyprocess",
direct = False,
),
py_requirement(
"requests",
direct = False,
),
py_requirement(
"urllib3",
direct = False,
),
py_requirement(
"websocket-client",
direct = False,
),
],
)
+4 -1
View File
@@ -31,7 +31,10 @@ py_library(
deps = [
"//benchmarks/harness:machine",
"//benchmarks/harness/machine_producers:machine_producer",
py_requirement("PyYAML", False),
py_requirement(
"PyYAML",
direct = False,
),
],
)
+5 -12
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "py_library", "py_requirement", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(licenses = ["notice"])
@@ -28,7 +29,7 @@ py_library(
"//benchmarks/suites:startup",
"//benchmarks/suites:sysbench",
"//benchmarks/suites:syscall",
py_requirement("click", True),
py_requirement("click"),
],
)
@@ -36,7 +37,7 @@ py_library(
name = "commands",
srcs = ["commands.py"],
deps = [
py_requirement("click", True),
py_requirement("click"),
],
)
@@ -48,16 +49,8 @@ py_test(
"local",
"manual",
],
deps = [
deps = test_deps + [
":runner",
py_requirement("click", True),
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
py_requirement("click"),
],
)
+3 -10
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement", "py_test")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -14,16 +15,8 @@ py_test(
name = "ab_test",
srcs = ["ab_test.py"],
python_version = "PY3",
deps = [
deps = test_deps + [
":ab",
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
],
)
+3 -10
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement", "py_test")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -14,16 +15,8 @@ py_test(
name = "absl_test",
srcs = ["absl_test.py"],
python_version = "PY3",
deps = [
deps = test_deps + [
":absl",
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
],
)
+3 -10
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement", "py_test")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -14,16 +15,8 @@ py_test(
name = "fio_test",
srcs = ["fio_test.py"],
python_version = "PY3",
deps = [
deps = test_deps + [
":fio",
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
],
)
+3 -10
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement", "py_test")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -14,16 +15,8 @@ py_test(
name = "iperf_test",
srcs = ["iperf_test.py"],
python_version = "PY3",
deps = [
deps = test_deps + [
":iperf",
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
],
)
+3 -10
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement", "py_test")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -14,16 +15,8 @@ py_test(
name = "redisbenchmark_test",
srcs = ["redisbenchmark_test.py"],
python_version = "PY3",
deps = [
deps = test_deps + [
":redisbenchmark",
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
],
)
+3 -10
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement", "py_test")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -14,16 +15,8 @@ py_test(
name = "sysbench_test",
srcs = ["sysbench_test.py"],
python_version = "PY3",
deps = [
deps = test_deps + [
":sysbench",
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
],
)
+3 -10
View File
@@ -1,4 +1,5 @@
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_requirement", "py_test")
load("//tools:defs.bzl", "pkg_tar", "py_library", "py_test")
load("//benchmarks:defs.bzl", "test_deps")
package(
default_visibility = ["//benchmarks:__subpackages__"],
@@ -14,16 +15,8 @@ py_test(
name = "syscall_test",
srcs = ["syscall_test.py"],
python_version = "PY3",
deps = [
deps = test_deps + [
":syscall",
py_requirement("attrs", False),
py_requirement("atomicwrites", False),
py_requirement("more-itertools", False),
py_requirement("pathlib2", False),
py_requirement("pluggy", False),
py_requirement("py", False),
py_requirement("pytest", True),
py_requirement("six", False),
],
)
+1 -1
View File
@@ -72,7 +72,7 @@ def go_test(name, **kwargs):
**kwargs
)
def py_requirement(name, direct = False):
def py_requirement(name, direct = True):
return _py_requirement(name)
def select_arch(amd64 = "amd64", arm64 = "arm64", default = None, **kwargs):