[Build] simple fixes a number of build targets

apache · Jan 26, 2022 · 821b857 · 821b857
1 parent ba1bac0
commit 821b857
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 36 deletions.
diff --git a/heron/instance/tests/python/BUILD b/heron/instance/tests/python/BUILD
@@ -6,11 +6,9 @@ load("@heron_py_deps//:requirements.bzl", "requirement")
 py_library(
     name = "instance-tests-py",
     srcs = ["mock_protobuf.py"],
-    reqs = [
-    ],
     deps = [
         "//heron/proto:proto-py",
         "//heronpy/api:heron-python-py",
-        requirement(pytest),
+        requirement("pytest"),
     ],
 )
diff --git a/heron/instance/tests/python/network/BUILD b/heron/instance/tests/python/network/BUILD
@@ -6,8 +6,6 @@ load("@heron_py_deps//:requirements.bzl", "requirement")
 py_library(
     name = "instance-network-mock",
     srcs = ["mock_generator.py"],
-    reqs = [
-    ],
     deps = [
         "//heron/instance/tests/python:instance-tests-py",
     ],
@@ -16,8 +14,6 @@ py_library(
 py_library(
     name = "instance-network-mock-client",
     srcs = ["mock_generator_client.py"],
-    reqs = [
-    ],
     deps = [
         "//heron/instance/tests/python:instance-tests-py",
     ],
@@ -54,11 +50,9 @@ pex_pytest(
 py_library(
     name = "pytest-network-py",
     srcs = ["mock_generator.py"],
-    reqs = [
-    ],
     deps = [
         ":instance-network-mock-client",
-        requirement(pytest),
+        requirement("pytest"),
     ],
 )
 

diff --git a/heron/instance/tests/python/utils/BUILD b/heron/instance/tests/python/utils/BUILD
@@ -5,8 +5,6 @@ load("@rules_python//python:defs.bzl", "py_library")
 py_library(
     name = "common-utils-mock",
     srcs = ["mock_generator.py"],
-    reqs = [
-    ],
     deps = [
         "//heron/instance/src/python:instance-py",
         "//heron/instance/tests/python:instance-tests-py",

diff --git a/heron/proto/BUILD b/heron/proto/BUILD
@@ -196,8 +196,8 @@ py_library(
         ":proto_tmanager_py",
         ":proto_topology_py",
         ":proto_tuple_py",
-        requirement(protobuf),
-        requirement(setuptools),
+        requirement("protobuf"),
+        requirement("setuptools"),
     ],
 )
 

diff --git a/heron/shell/src/python/BUILD b/heron/shell/src/python/BUILD
@@ -6,20 +6,18 @@ load("@heron_py_deps//:requirements.bzl", "requirement")
 
 py_library(
     name = "heron-shell-lib",
-    srcs = glob(
-        ["**/*.py"],
-    ),
+    srcs = glob(["**/*.py"]),
     deps = [
         "//heron/common/src/python:common-py",
-        requirement(logging-formatter-anticrlf),
-        requirement(requests),
-        requirement(tornado),
+        requirement("logging-formatter-anticrlf"),
+        requirement("requests"),
+        requirement("tornado"),
     ],
 )
 
 py_binary(
     name = "heron-shell",
-    main = "main.py"
+    main = "main.py",
     srcs = ["main.py"],
     resources = [
         "//heron/shell/assets",

diff --git a/heron/tools/tracker/src/python/BUILD b/heron/tools/tracker/src/python/BUILD
@@ -16,13 +16,13 @@ py_library(
         "//heron/statemgrs/src/python:statemgr-py",
         "//heron/tools/common/src/python:common-py",
         "//heronpy/api:heron-python-py",
-        requirement(click),
-        requirement(fastapi),
-        requirement(httpx),
-        requirement(javaobj),
-        requirement(networkx),
-        requirement(protobuf),
-        requirement(uvicorn),
+        requirement("click"),
+        requirement("fastapi"),
+        requirement("httpx"),
+        requirement("javaobj"),
+        requirement("networkx"),
+        requirement("protobuf"),
+        requirement("uvicorn"),
     ],
 )
 

diff --git a/heron/tools/ui/src/python/BUILD b/heron/tools/ui/src/python/BUILD
@@ -14,19 +14,19 @@ py_library(
         "//heron/common/src/python:common-py",
         "//heron/tools/common/src/python:common-py",
         "//heron/tools/common/src/python:tracker-py",
-        requirement(requests),
-        requirement(click),
-        requirement(fastapi),
-        requirement(jinja2),
-        requirement(aiofiles),
-        requirement(uvicorn),
-        requirement(uvloop),
+        requirement("requests"),
+        requirement("click"),
+        requirement("fastapi"),
+        requirement("jinja2"),
+        requirement("aiofiles"),
+        requirement("uvicorn"),
+        requirement("uvloop"),
     ],
 )
 
 py_binary(
     name = "heron-ui",
-    main = "main.py"
+    main = "main.py",
     srcs = ["main.py"],
     resources = [
         "//heron/tools/ui/resources:static",