Skip to content

Commit 4d66f55

Browse files
committed
py3: remove @org_pythonhosted_six deps
Summary: As of the previous sequence of changes, none of our code uses `six`. We still keep it in the build workspace because protobuf requires that it exist there (see comment in `third_party/python.bzl`), but we can remove all dependency edges from our code to `@org_pythonhosted_six`. Generated with: ``` buildozer //tensorboard/...:all 'remove deps @org_pythonhosted_six' ``` Test Plan: It suffices that all tests pass both here and in a test sync. wchargin-branch: py3-no-six-deps
1 parent 80ca6a1 commit 4d66f55

File tree

27 files changed

+4
-102
lines changed

27 files changed

+4
-102
lines changed

tensorboard/BUILD

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,13 @@ py_test(
7575
srcs_version = "PY3",
7676
tags = ["support_notf"],
7777
visibility = ["//tensorboard:internal"],
78-
deps = [
79-
":lib",
80-
"@org_pythonhosted_six",
81-
],
78+
deps = [":lib"],
8279
)
8380

8481
py_library(
8582
name = "auth",
8683
srcs = ["auth.py"],
8784
srcs_version = "PY3",
88-
deps = [
89-
"@org_pythonhosted_six",
90-
],
9185
)
9286

9387
py_test(
@@ -148,7 +142,6 @@ py_library(
148142
deps = [
149143
":version",
150144
"//tensorboard/util:tb_logging",
151-
"@org_pythonhosted_six",
152145
],
153146
)
154147

@@ -164,7 +157,6 @@ py_test(
164157
":test",
165158
":version",
166159
"//tensorboard/util:tb_logging",
167-
"@org_pythonhosted_six",
168160
],
169161
)
170162

@@ -185,7 +177,6 @@ py_test(
185177
deps = [
186178
":manager",
187179
"//tensorboard:expect_tensorflow_installed",
188-
"@org_pythonhosted_six",
189180
],
190181
)
191182

@@ -213,7 +204,6 @@ py_library(
213204
"//tensorboard/backend/event_processing:event_file_inspector",
214205
"//tensorboard/data:server_ingester",
215206
"@org_pocoo_werkzeug",
216-
"@org_pythonhosted_six",
217207
],
218208
)
219209

@@ -230,7 +220,6 @@ py_test(
230220
"//tensorboard/plugins:base_plugin",
231221
"//tensorboard/plugins/core:core_plugin",
232222
"@org_pocoo_werkzeug",
233-
"@org_pythonhosted_six",
234223
],
235224
)
236225

@@ -242,7 +231,6 @@ py_library(
242231
deps = [
243232
"//tensorboard:expect_absl_testing_absltest_installed",
244233
"//tensorboard/util:tb_logging",
245-
"@org_pythonhosted_six",
246234
],
247235
)
248236

@@ -523,7 +511,6 @@ py_binary(
523511
"//tensorboard:expect_tensorflow_installed",
524512
"//tensorboard/util:encoder",
525513
"//tensorboard/util:tb_logging",
526-
"@org_pythonhosted_six",
527514
],
528515
)
529516

@@ -537,7 +524,6 @@ py_library(
537524
"//tensorboard/backend:experiment_id",
538525
"@org_mozilla_bleach",
539526
"@org_pythonhosted_markdown",
540-
"@org_pythonhosted_six",
541527
],
542528
)
543529

@@ -552,7 +538,6 @@ py_test(
552538
":plugin_util",
553539
":test",
554540
"//tensorboard/backend:experiment_id",
555-
"@org_pythonhosted_six",
556541
],
557542
)
558543

@@ -574,8 +559,5 @@ py_test(
574559
srcs = ["lazy_test.py"],
575560
srcs_version = "PY3",
576561
tags = ["support_notf"],
577-
deps = [
578-
":lazy",
579-
"@org_pythonhosted_six",
580-
],
562+
deps = [":lazy"],
581563
)

tensorboard/backend/BUILD

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ py_library(
1313
deps = [
1414
":json_util",
1515
"@org_pocoo_werkzeug",
16-
"@org_pythonhosted_six",
1716
],
1817
)
1918

@@ -27,7 +26,6 @@ py_test(
2726
":http_util",
2827
"//tensorboard:test",
2928
"@org_pocoo_werkzeug",
30-
"@org_pythonhosted_six",
3129
],
3230
)
3331

@@ -68,7 +66,6 @@ py_library(
6866
"//tensorboard/plugins/core:core_plugin",
6967
"//tensorboard/util:tb_logging",
7068
"@org_pocoo_werkzeug",
71-
"@org_pythonhosted_six",
7269
],
7370
)
7471

tensorboard/backend/event_processing/BUILD

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ py_library(
1313
deps = [
1414
"//tensorboard/compat:tensorflow",
1515
"//tensorboard/util:tb_logging",
16-
"@org_pythonhosted_six",
1716
],
1817
)
1918

@@ -25,7 +24,6 @@ py_test(
2524
deps = [
2625
":io_wrapper",
2726
"//tensorboard:expect_tensorflow_installed",
28-
"@org_pythonhosted_six",
2927
],
3028
)
3129

@@ -68,7 +66,6 @@ py_library(
6866
"//tensorboard/data:provider",
6967
"//tensorboard/util:tb_logging",
7068
"//tensorboard/util:tensor_util",
71-
"@org_pythonhosted_six",
7269
],
7370
)
7471

@@ -91,7 +88,6 @@ py_test(
9188
"//tensorboard/plugins/scalar:metadata",
9289
"//tensorboard/plugins/scalar:summary_v2",
9390
"//tensorboard/util:tensor_util",
94-
"@org_pythonhosted_six",
9591
],
9692
)
9793

@@ -186,7 +182,6 @@ py_test(
186182
"//tensorboard:expect_tensorflow_installed",
187183
"//tensorboard/compat/proto:protos_all_py_pb2",
188184
"//tensorboard/summary/writer",
189-
"@org_pythonhosted_six",
190185
],
191186
)
192187

@@ -202,7 +197,6 @@ py_test(
202197
"//tensorboard/compat:no_tensorflow",
203198
"//tensorboard/compat/proto:protos_all_py_pb2",
204199
"//tensorboard/summary/writer",
205-
"@org_pythonhosted_six",
206200
],
207201
)
208202

@@ -274,7 +268,6 @@ py_test(
274268
"//tensorboard/util:tb_logging",
275269
"//tensorboard/util:tensor_util",
276270
"//tensorboard/util:test_util",
277-
"@org_pythonhosted_six",
278271
],
279272
)
280273

@@ -291,7 +284,6 @@ py_library(
291284
":event_accumulator",
292285
":io_wrapper",
293286
"//tensorboard/util:tb_logging",
294-
"@org_pythonhosted_six",
295287
],
296288
)
297289

tensorboard/compat/proto/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,5 @@ py_test(
309309
deps = [
310310
":protos_all_py_pb2",
311311
"//tensorboard:expect_tensorflow_installed",
312-
"@org_pythonhosted_six",
313312
],
314313
)

tensorboard/compat/tensorflow_stub/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ py_library(
1818
"//tensorboard:expect_absl_flags_installed",
1919
"//tensorboard:expect_numpy_installed",
2020
"//tensorboard/compat/proto:protos_all_py_pb2",
21-
"@org_pythonhosted_six",
2221
],
2322
)
2423

tensorboard/data/BUILD

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ py_library(
1919
name = "provider",
2020
srcs = ["provider.py"],
2121
srcs_version = "PY3",
22-
deps = [
23-
"//tensorboard:expect_numpy_installed",
24-
"@org_pythonhosted_six",
25-
],
22+
deps = ["//tensorboard:expect_numpy_installed"],
2623
)
2724

2825
py_test(
@@ -35,7 +32,6 @@ py_test(
3532
":provider",
3633
"//tensorboard:expect_numpy_installed",
3734
"//tensorboard:test",
38-
"@org_pythonhosted_six",
3935
],
4036
)
4137

tensorboard/data/experimental/BUILD

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,5 @@ py_binary(
6161
name = "test_binary",
6262
srcs = ["test_binary.py"],
6363
srcs_version = "PY3",
64-
deps = [
65-
"//tensorboard/data/experimental:experiment_from_dev",
66-
"@org_pythonhosted_six",
67-
],
64+
deps = ["//tensorboard/data/experimental:experiment_from_dev"],
6865
)

tensorboard/plugins/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ py_library(
1010
srcs = ["base_plugin.py"],
1111
srcs_version = "PY3",
1212
visibility = ["//visibility:public"],
13-
deps = [
14-
"@org_pythonhosted_six",
15-
],
1613
)
1714

1815
py_test(
@@ -22,6 +19,5 @@ py_test(
2219
deps = [
2320
":base_plugin",
2421
"//tensorboard:test",
25-
"@org_pythonhosted_six",
2622
],
2723
)

tensorboard/plugins/audio/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ py_library(
1919
"//tensorboard/data:provider",
2020
"//tensorboard/plugins:base_plugin",
2121
"@org_pocoo_werkzeug",
22-
"@org_pythonhosted_six",
2322
],
2423
)
2524

@@ -39,7 +38,6 @@ py_test(
3938
"//tensorboard/plugins:base_plugin",
4039
"//tensorboard/util:test_util",
4140
"@org_pocoo_werkzeug",
42-
"@org_pythonhosted_six",
4341
],
4442
)
4543

@@ -62,7 +60,6 @@ py_test(
6260
"//tensorboard/plugins:base_plugin",
6361
"//tensorboard/util:test_util",
6462
"@org_pocoo_werkzeug",
65-
"@org_pythonhosted_six",
6663
],
6764
)
6865

@@ -114,7 +111,6 @@ py_binary(
114111
deps = [
115112
":summary",
116113
"//tensorboard:expect_tensorflow_installed",
117-
"@org_pythonhosted_six",
118114
],
119115
)
120116

tensorboard/plugins/core/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ py_library(
1515
"//tensorboard/plugins:base_plugin",
1616
"//tensorboard/util:tb_logging",
1717
"@org_pocoo_werkzeug",
18-
"@org_pythonhosted_six",
1918
],
2019
)
2120

@@ -34,6 +33,5 @@ py_test(
3433
"//tensorboard/plugins:base_plugin",
3534
"//tensorboard/util:test_util",
3635
"@org_pocoo_werkzeug",
37-
"@org_pythonhosted_six",
3836
],
3937
)

0 commit comments

Comments
 (0)