Skip to content

Commit 056785b

Browse files
committed
update project dependencies
update bazel to latest in Dockerfile update docker, go, protobuf and grpc build deps to latest update lang specific protobuf rule name in client BUILD files
1 parent 9098e5d commit 056785b

File tree

8 files changed

+37
-59
lines changed

8 files changed

+37
-59
lines changed

WORKSPACE

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,77 +34,69 @@ register_clang_cross_toolchains(clang_version = "11")
3434

3535
http_archive(
3636
name = "rules_python",
37-
sha256 = "afe33d4a8091452cb785108f237c7f3dcef56345952aad124954a96d89c4aab6",
38-
strip_prefix = "rules_python-0d23d579fd93b72fe94b27b0077fbf3dc8680724",
39-
urls = ["https://github.com/bazelbuild/rules_python/archive/0d23d579fd93b72fe94b27b0077fbf3dc8680724.tar.gz"],
37+
sha256 = "4feecd37ec6e9941a455a19e7392bed65003eab0aa6ea347ca431bce2640e530",
38+
strip_prefix = "rules_python-0.3.0",
39+
urls = ["https://github.com/bazelbuild/rules_python/archive/0.3.0.tar.gz"],
4040
)
4141

42-
load("@rules_python//python:repositories.bzl", "py_repositories")
43-
44-
py_repositories()
45-
46-
load("@rules_python//python:pip.bzl", "pip_repositories")
47-
48-
pip_repositories()
49-
5042
# go client deps
5143

5244
http_archive(
5345
name = "io_bazel_rules_go",
54-
sha256 = "7904dbecbaffd068651916dce77ff3437679f9d20e1a7956bff43826e7645fcc",
46+
sha256 = "8e968b5fcea1d2d64071872b12737bbb5514524ee5f0a4f54f5920266c261acb",
5547
urls = [
56-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
57-
"https://github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
48+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip",
49+
"https://github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip",
5850
],
5951
)
6052

6153
http_archive(
6254
name = "bazel_gazelle",
63-
sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4",
55+
sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f",
6456
urls = [
65-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
66-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
57+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
58+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
6759
],
6860
)
6961

7062
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
7163

7264
go_rules_dependencies()
7365

74-
go_register_toolchains(version = "1.16")
66+
go_register_toolchains(version = "1.17")
7567

7668
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
7769

7870
gazelle_dependencies()
7971

8072
go_repository(
8173
name = "org_golang_google_grpc",
82-
commit = "f74f0337644653eba7923908a4d7f79a4f3a267b", # 1.36.0
74+
commit = "41e044e1c82fcf6a5801d6cbd7ecf952505eecb1", # 1.40.0
8375
importpath = "google.golang.org/grpc",
8476
)
8577

8678
go_repository(
8779
name = "org_golang_x_net",
8880
importpath = "golang.org/x/net",
89-
sum = "h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=",
90-
version = "v0.0.0-20190311183353-d8887717615a",
81+
sum = "h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=",
82+
version = "v0.0.0-20210813160813-60bc85c4be6d",
9183
)
9284

9385
go_repository(
9486
name = "org_golang_x_text",
9587
importpath = "golang.org/x/text",
96-
sum = "h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=",
97-
version = "v0.3.0",
88+
sum = "h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=",
89+
version = "v0.3.7",
9890
)
9991

10092
# protobuf / grpc deps
10193

10294
http_archive(
10395
name = "com_google_protobuf",
104-
sha256 = "0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441",
105-
strip_prefix = "protobuf-3.15.8",
96+
sha256 = "c6003e1d2e7fefa78a3039f19f383b4f3a61e81be8c19356f85b6461998ad3db",
97+
strip_prefix = "protobuf-3.17.3",
10698
urls = [
107-
"https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz",
99+
"https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz",
108100
],
109101
)
110102

@@ -114,13 +106,10 @@ protobuf_deps()
114106

115107
http_archive(
116108
name = "com_github_grpc_grpc",
117-
patches = [
118-
"@//third_party/grpc:cython_library.patch",
119-
],
120-
sha256 = "bb6de0544adddd54662ba1c314eff974e84c955c39204a4a2b733ccd990354b7",
121-
strip_prefix = "grpc-1.36.3",
109+
sha256 = "024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec",
110+
strip_prefix = "grpc-1.39.1",
122111
urls = [
123-
"https://github.com/grpc/grpc/archive/v1.36.3.tar.gz"
112+
"https://github.com/grpc/grpc/archive/v1.39.1.tar.gz"
124113
],
125114
)
126115

cc/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ package(default_visibility = ["//visibility:public"])
2323
cc_grpc_library(
2424
name = "grpc",
2525
srcs = ["//proto/tensorflow_serving/apis:protos_grpc_all"],
26-
deps = [":protobuf"],
26+
deps = [":protos"],
2727
)
2828

2929
cc_proto_library(
30-
name = "protobuf",
30+
name = "protos",
3131
deps = ["//proto:protos_all"],
3232
)

go/BUILD

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,36 @@ go_grpc_library(
2323
name = "grpc",
2424
srcs = ["//proto/tensorflow_serving/apis:protos_grpc_all"],
2525
importpath = "github.com/emacski/tensorflow-serving-arm-client/go/tensorflow_serving",
26-
deps = [":protobuf"],
26+
deps = [":protos"],
2727
)
2828

2929
go_proto_library(
30-
name = "protobuf",
30+
name = "protos",
3131
importpath = "github.com/emacski/tensorflow-serving-arm-client/go/tensorflow_serving",
3232
proto = ["//proto/tensorflow_serving:protos_all"],
3333
deps = [
34-
":tensorflow_core_protobuf",
35-
":tensorflow_example_protobuf",
36-
":tensorflow_framework_protobuf",
34+
":tensorflow_core_protos",
35+
":tensorflow_example_protos",
36+
":tensorflow_framework_protos",
3737
],
3838
)
3939

4040
go_proto_library(
41-
name = "tensorflow_core_protobuf",
41+
name = "tensorflow_core_protos",
4242
importpath = "github.com/emacski/tensorflow-serving-arm-client/go/tensorflow/core",
4343
proto = ["//proto/tensorflow/core:protos_all"],
44-
deps = [":tensorflow_framework_protobuf"],
44+
deps = [":tensorflow_framework_protos"],
4545
)
4646

4747
go_proto_library(
48-
name = "tensorflow_example_protobuf",
48+
name = "tensorflow_example_protos",
4949
importpath = "github.com/emacski/tensorflow-serving-arm-client/go/tensorflow/core/example",
5050
proto = ["//proto/tensorflow/core/example:protos_all"],
51-
deps = [":tensorflow_framework_protobuf"],
51+
deps = [":tensorflow_framework_protos"],
5252
)
5353

5454
go_proto_library(
55-
name = "tensorflow_framework_protobuf",
55+
name = "tensorflow_framework_protos",
5656
importpath = "github.com/emacski/tensorflow-serving-arm-client/go/tensorflow/core/framework",
5757
proto = ["//proto/tensorflow/core/framework:protos_all"],
5858
)

go/example/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ go_library(
2626
deps = [
2727
"@org_golang_google_grpc//:go_default_library",
2828
"@com_github_emacski_tensorflowservingarmclient//go:grpc",
29-
"@com_github_emacski_tensorflowservingarmclient//go:tensorflow_framework_protobuf",
29+
"@com_github_emacski_tensorflowservingarmclient//go:tensorflow_framework_protos",
3030
# only required for output formatting
3131
"@org_golang_google_protobuf//encoding/prototext:go_default_library",
3232
],

py/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ py_grpc_library(
2424
name = "grpc",
2525
srcs = ["//proto/tensorflow_serving/apis:protos_grpc_all"],
2626
srcs_version = "PY3",
27-
deps = [":protobuf"],
27+
deps = [":protos"],
2828
)
2929

3030
py_proto_library(
31-
name = "protobuf",
31+
name = "protos",
3232
srcs_version = "PY3",
3333
deps = ["//proto:protos_all"],
3434
)

third_party/grpc/BUILD

Whitespace-only changes.

third_party/grpc/cython_library.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

tools/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN apt-get update && \
5151
make patch zlib1g-dev git && \
5252
apt-get clean && \
5353
rm -rf /var/lib/apt/lists/*
54-
ENV INSTALL_BAZEL_VERSION=4.0.0
54+
ENV INSTALL_BAZEL_VERSION=4.2.0
5555
RUN curl -L https://github.com/bazelbuild/bazel/releases/download/${INSTALL_BAZEL_VERSION}/bazel-${INSTALL_BAZEL_VERSION}-installer-linux-x86_64.sh \
5656
-o bazel-${INSTALL_BAZEL_VERSION}-installer-linux-x86_64.sh && \
5757
chmod +x bazel-${INSTALL_BAZEL_VERSION}-installer-linux-x86_64.sh && \

0 commit comments

Comments
 (0)