From 3b7416dc43861ff8ea58e0795ae455266e4a34e2 Mon Sep 17 00:00:00 2001 From: Dan Moldovan Date: Thu, 22 Oct 2020 06:27:18 -0700 Subject: [PATCH] Switch all sources to PY3 only. PiperOrigin-RevId: 338459870 Change-Id: I27338c3b4d12fa6e23bf6fd550f65363109e96e4 --- tensorflow/python/autograph/converters/BUILD | 24 +++++++------- tensorflow/python/autograph/core/BUILD | 8 ++--- tensorflow/python/autograph/impl/BUILD | 2 +- tensorflow/python/autograph/lang/BUILD | 4 +-- tensorflow/python/autograph/operators/BUILD | 17 ++++------ tensorflow/python/autograph/pyct/BUILD | 32 +++++++++---------- .../autograph/pyct/common_transformers/BUILD | 4 +-- .../autograph/pyct/static_analysis/BUILD | 6 ++-- .../python/autograph/pyct/testing/BUILD | 6 ++-- tensorflow/python/autograph/utils/BUILD | 12 +++---- 10 files changed, 55 insertions(+), 60 deletions(-) diff --git a/tensorflow/python/autograph/converters/BUILD b/tensorflow/python/autograph/converters/BUILD index fd8ec1dbaa3..e3153d3f93c 100644 --- a/tensorflow/python/autograph/converters/BUILD +++ b/tensorflow/python/autograph/converters/BUILD @@ -35,7 +35,7 @@ py_library( "slices.py", "variables.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ "//tensorflow/python:util", @@ -52,7 +52,7 @@ py_test( name = "asserts_test", srcs = ["asserts_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -64,7 +64,7 @@ py_test( name = "break_statements_test", srcs = ["break_statements_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -88,7 +88,7 @@ py_test( name = "conditional_expressions_test", srcs = ["conditional_expressions_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -100,7 +100,7 @@ py_test( name = "continue_statements_test", srcs = ["continue_statements_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -126,7 +126,7 @@ py_test( name = "directives_test", srcs = ["directives_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -151,7 +151,7 @@ py_test( name = "list_comprehensions_test", srcs = ["list_comprehensions_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -163,7 +163,7 @@ py_test( name = "lists_test", srcs = ["lists_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -175,7 +175,7 @@ py_test( name = "logical_expressions_test", srcs = ["logical_expressions_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = ["notsan"], # b/163218460 deps = [ ":converters", @@ -188,7 +188,7 @@ py_test( name = "return_statements_test", srcs = ["return_statements_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -201,7 +201,7 @@ py_test( name = "slices_test", srcs = ["slices_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", @@ -214,7 +214,7 @@ py_test( name = "variables_test", srcs = ["variables_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":converters", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/autograph/core/BUILD b/tensorflow/python/autograph/core/BUILD index 4a5c50dac55..77d34240d24 100644 --- a/tensorflow/python/autograph/core/BUILD +++ b/tensorflow/python/autograph/core/BUILD @@ -26,7 +26,7 @@ py_library( "function_wrappers.py", "unsupported_features_checker.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ "//tensorflow/python:framework_ops", @@ -43,7 +43,7 @@ py_library( srcs = [ "converter_testing.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ ":core", @@ -61,7 +61,7 @@ py_test( name = "converter_test", srcs = ["converter_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":core", ":test_lib", @@ -73,7 +73,7 @@ py_test( name = "function_wrappers_test", srcs = ["function_wrappers_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":core", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/autograph/impl/BUILD b/tensorflow/python/autograph/impl/BUILD index 4c5475bbb74..1434c9fd542 100644 --- a/tensorflow/python/autograph/impl/BUILD +++ b/tensorflow/python/autograph/impl/BUILD @@ -22,7 +22,7 @@ py_library( "api.py", "conversion.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ "//tensorflow/python:platform", diff --git a/tensorflow/python/autograph/lang/BUILD b/tensorflow/python/autograph/lang/BUILD index ceccc6f0c93..e0db4f0d5e2 100644 --- a/tensorflow/python/autograph/lang/BUILD +++ b/tensorflow/python/autograph/lang/BUILD @@ -22,7 +22,7 @@ py_library( "directives.py", "special_functions.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ "//tensorflow/python/autograph/operators", @@ -33,7 +33,7 @@ py_test( name = "special_functions_test", srcs = ["special_functions_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":lang", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/autograph/operators/BUILD b/tensorflow/python/autograph/operators/BUILD index 13b3b7a1764..ab9babf9149 100644 --- a/tensorflow/python/autograph/operators/BUILD +++ b/tensorflow/python/autograph/operators/BUILD @@ -22,7 +22,6 @@ py_library( "__init__.py", "conditional_expressions.py", "control_flow.py", - "control_flow_deprecated_py2.py", "data_structures.py", "exceptions.py", "logical.py", @@ -30,7 +29,7 @@ py_library( "slices.py", "variables.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ "//tensorflow/python:array_ops", @@ -54,7 +53,7 @@ py_test( name = "data_structures_test", srcs = ["data_structures_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":operators", "//tensorflow/python:client_testlib", @@ -66,9 +65,6 @@ py_test( srcs = ["conditional_expressions_test.py"], python_version = "PY3", srcs_version = "PY3", - tags = [ - "no_oss_py2", - ], deps = [ ":operators", "//tensorflow/python:client_testlib", @@ -82,7 +78,6 @@ py_test( srcs_version = "PY3", tags = [ "no_gpu", # b/127001953 - "no_oss_py2", ], deps = [ ":operators", @@ -96,7 +91,7 @@ py_test( name = "exceptions_test", srcs = ["exceptions_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":operators", "//tensorflow/python:client_testlib", @@ -107,7 +102,7 @@ py_test( name = "logical_test", srcs = ["logical_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":operators", "//tensorflow/python:client_testlib", @@ -134,7 +129,7 @@ py_test( name = "slices_test", srcs = ["slices_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":operators", "//tensorflow/python:client_testlib", @@ -145,7 +140,7 @@ py_test( name = "variables_test", srcs = ["variables_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":operators", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/autograph/pyct/BUILD b/tensorflow/python/autograph/pyct/BUILD index 940b542fcaa..09f98682efa 100644 --- a/tensorflow/python/autograph/pyct/BUILD +++ b/tensorflow/python/autograph/pyct/BUILD @@ -38,7 +38,7 @@ py_library( "transformer.py", "transpiler.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python/autograph/pyct/common_transformers", @@ -53,7 +53,7 @@ py_test( name = "anno_test", srcs = ["anno_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -64,7 +64,7 @@ py_test( name = "ast_util_test", srcs = ["ast_util_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = [ "no_oss_py2", ], @@ -79,7 +79,7 @@ py_test( name = "cache_test", srcs = ["cache_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = [ "no_oss_py2", ], @@ -94,7 +94,7 @@ py_test( name = "cfg_test", srcs = ["cfg_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = [ "no_oss_py2", ], @@ -109,7 +109,7 @@ py_test( name = "loader_test", srcs = ["loader_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -121,7 +121,7 @@ py_test( name = "error_utils_test", srcs = ["error_utils_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -133,7 +133,7 @@ py_test( name = "inspect_utils_test", srcs = ["inspect_utils_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -152,7 +152,7 @@ py_test( name = "naming_test", srcs = ["naming_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -163,7 +163,7 @@ py_test( name = "origin_info_test", srcs = ["origin_info_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -175,7 +175,7 @@ py_test( name = "parser_test", srcs = ["parser_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -186,7 +186,7 @@ py_test( name = "pretty_printer_test", srcs = ["pretty_printer_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -197,7 +197,7 @@ py_test( name = "qual_names_test", srcs = ["qual_names_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -208,7 +208,7 @@ py_test( name = "templates_test", srcs = ["templates_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -221,7 +221,7 @@ py_test( name = "transformer_test", srcs = ["transformer_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", @@ -233,7 +233,7 @@ py_test( name = "transpiler_test", srcs = ["transpiler_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pyct", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/autograph/pyct/common_transformers/BUILD b/tensorflow/python/autograph/pyct/common_transformers/BUILD index 61856a590ae..ecb50b2cece 100644 --- a/tensorflow/python/autograph/pyct/common_transformers/BUILD +++ b/tensorflow/python/autograph/pyct/common_transformers/BUILD @@ -21,7 +21,7 @@ py_library( srcs = [ "anf.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "@gast_archive//:gast", @@ -33,7 +33,7 @@ py_test( name = "anf_test", srcs = ["anf_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = ["no_oss"], deps = [ "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/autograph/pyct/static_analysis/BUILD b/tensorflow/python/autograph/pyct/static_analysis/BUILD index 5127cfe557f..0f05cb58d9e 100644 --- a/tensorflow/python/autograph/pyct/static_analysis/BUILD +++ b/tensorflow/python/autograph/pyct/static_analysis/BUILD @@ -26,7 +26,7 @@ py_library( "reaching_fndefs.py", "type_inference.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:util", @@ -40,7 +40,7 @@ py_test( name = "activity_test", srcs = ["activity_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":static_analysis", "//tensorflow/python:client_testlib", @@ -53,7 +53,7 @@ py_library( name = "activity_test_lib", testonly = True, srcs = ["activity_test.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":static_analysis", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/autograph/pyct/testing/BUILD b/tensorflow/python/autograph/pyct/testing/BUILD index 59b15ceaf05..811ee6faae1 100644 --- a/tensorflow/python/autograph/pyct/testing/BUILD +++ b/tensorflow/python/autograph/pyct/testing/BUILD @@ -22,7 +22,7 @@ py_library( "basic_definitions.py", "decorators.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], ) @@ -31,7 +31,7 @@ py_library( srcs = [ "codegen.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python/autograph/pyct", @@ -45,7 +45,7 @@ py_test( size = "large", srcs = ["codegen_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = [ "manual", "no_windows", diff --git a/tensorflow/python/autograph/utils/BUILD b/tensorflow/python/autograph/utils/BUILD index ba44b2b435c..5bb561014c3 100644 --- a/tensorflow/python/autograph/utils/BUILD +++ b/tensorflow/python/autograph/utils/BUILD @@ -29,7 +29,7 @@ py_library( "tensors.py", "testing.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ "//tensorflow/python:dtypes", @@ -47,7 +47,7 @@ py_test( name = "context_managers_test", srcs = ["context_managers_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":utils", "//tensorflow/python:client_testlib", @@ -58,7 +58,7 @@ py_test( name = "misc_test", srcs = ["misc_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":utils", "//tensorflow/python:client_testlib", @@ -69,7 +69,7 @@ py_test( name = "py_func_test", srcs = ["py_func_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = ["no_windows"], deps = [ ":utils", @@ -81,7 +81,7 @@ py_test( name = "tensor_list_test", srcs = ["tensor_list_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":utils", "//tensorflow/python:client_testlib", @@ -93,7 +93,7 @@ py_test( name = "tensors_test", srcs = ["tensors_test.py"], python_version = "PY3", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":utils", "//tensorflow/python:client_testlib",