Remove py_transitions implementation

RELNOTES[INC]: py_transitions top-level was removed. PiperOrigin-RevId: 557780220 Change-Id: I0b803a33c758a0bced048f7d17d83c31c9ce34e6
bazelbuild · Aug 17, 2023 · e2c4d3c · e2c4d3c
1 parent e6e79fc
commit e2c4d3c
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 269 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -115,7 +115,6 @@
 import com.google.devtools.build.lib.rules.proto.ProtoLangToolchainRule;
 import com.google.devtools.build.lib.rules.python.PyRuleClasses.PySymlink;
 import com.google.devtools.build.lib.rules.python.PyRuntimeRule;
-import com.google.devtools.build.lib.rules.python.PyStarlarkTransitions;
 import com.google.devtools.build.lib.rules.python.PythonConfiguration;
 import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules;
 import com.google.devtools.build.lib.rules.repository.NewLocalRepositoryRule;
@@ -479,7 +478,7 @@ public void init(ConfiguredRuleClassProvider.Builder builder) {
               ContextGuardedValue.onlyInAllowedRepos(
                   Starlark.NONE, PyBootstrap.allowedRepositories));
           builder.addStarlarkBuiltinsInternal(BazelPyBuiltins.NAME, new BazelPyBuiltins());
-          builder.addStarlarkBootstrap(new PyBootstrap(PyStarlarkTransitions.INSTANCE));
+          builder.addStarlarkBootstrap(new PyBootstrap());
           builder.addSymlinkDefinition(PySymlink.PY2);
           builder.addSymlinkDefinition(PySymlink.PY3);
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitions.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitions.java
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/BUILD
@@ -29,7 +29,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/packages/semantics",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core",
-        "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp",
         "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/stubs",
         "//src/main/java/net/starlark/java/annot",
         "//src/main/java/net/starlark/java/eval",

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyBootstrap.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyBootstrap.java
@@ -21,7 +21,6 @@
 import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap;
 import com.google.devtools.build.lib.starlarkbuildapi.core.ContextAndFlagGuardedValue;
 import com.google.devtools.build.lib.starlarkbuildapi.stubs.ProviderStub;
-import net.starlark.java.eval.FlagGuardedValue;
 
 /** {@link Bootstrap} for Starlark objects related to the Python rules. */
 public class PyBootstrap implements Bootstrap {
@@ -32,11 +31,7 @@ public class PyBootstrap implements Bootstrap {
           PackageIdentifier.createUnchecked("rules_python", ""),
           PackageIdentifier.createUnchecked("", "tools/build_defs/python"));
 
-  private final PyStarlarkTransitionsApi pyStarlarkTransitionsApi;
-
-  public PyBootstrap(PyStarlarkTransitionsApi pyStarlarkTransitionsApi) {
-    this.pyStarlarkTransitionsApi = pyStarlarkTransitionsApi;
-  }
+  public PyBootstrap() {}
 
   @Override
   public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) {
@@ -55,10 +50,6 @@ public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) {
             new ProviderStub(),
             allowedRepositories));
 
-    builder.put(
-        "py_transitions",
-        FlagGuardedValue.onlyWhenExperimentalFlagIsTrue(
-            BuildLanguageOptions.EXPERIMENTAL_GOOGLE_LEGACY_API, pyStarlarkTransitionsApi));
     builder.put(
         "PyWrapCcInfo",
         ContextAndFlagGuardedValue.onlyInAllowedReposOrWhenIncompatibleFlagIsFalse(

diff --git a/.../java/com/google/devtools/build/lib/starlarkbuildapi/python/PyStarlarkTransitionsApi.java b/.../java/com/google/devtools/build/lib/starlarkbuildapi/python/PyStarlarkTransitionsApi.java
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/BUILD b/src/test/java/com/google/devtools/build/lib/rules/python/BUILD
@@ -203,21 +203,6 @@ java_test(
     ],
 )
 
-java_test(
-    name = "PyStarlarkTransitionsTest",
-    srcs = ["PyStarlarkTransitionsTest.java"],
-    deps = [
-        "//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
-        "//src/main/java/com/google/devtools/build/lib/cmdline",
-        "//src/main/java/com/google/devtools/build/lib/packages",
-        "//src/main/java/com/google/devtools/build/lib/rules/python",
-        "//src/test/java/com/google/devtools/build/lib/analysis/util",
-        "//third_party:guava",
-        "//third_party:junit4",
-        "//third_party:truth",
-    ],
-)
-
 java_test(
     name = "PythonStarlarkApiTest",
     srcs = ["PythonStarlarkApiTest.java"],

diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitionsTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitionsTest.java