Skip to content

Commit e2c4d3c

Browse files
comiuscopybara-github
authored andcommitted
Remove py_transitions implementation
RELNOTES[INC]: py_transitions top-level was removed. PiperOrigin-RevId: 557780220 Change-Id: I0b803a33c758a0bced048f7d17d83c31c9ce34e6
1 parent e6e79fc commit e2c4d3c

File tree

7 files changed

+2
-269
lines changed

7 files changed

+2
-269
lines changed

src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
import com.google.devtools.build.lib.rules.proto.ProtoLangToolchainRule;
116116
import com.google.devtools.build.lib.rules.python.PyRuleClasses.PySymlink;
117117
import com.google.devtools.build.lib.rules.python.PyRuntimeRule;
118-
import com.google.devtools.build.lib.rules.python.PyStarlarkTransitions;
119118
import com.google.devtools.build.lib.rules.python.PythonConfiguration;
120119
import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules;
121120
import com.google.devtools.build.lib.rules.repository.NewLocalRepositoryRule;
@@ -479,7 +478,7 @@ public void init(ConfiguredRuleClassProvider.Builder builder) {
479478
ContextGuardedValue.onlyInAllowedRepos(
480479
Starlark.NONE, PyBootstrap.allowedRepositories));
481480
builder.addStarlarkBuiltinsInternal(BazelPyBuiltins.NAME, new BazelPyBuiltins());
482-
builder.addStarlarkBootstrap(new PyBootstrap(PyStarlarkTransitions.INSTANCE));
481+
builder.addStarlarkBootstrap(new PyBootstrap());
483482
builder.addSymlinkDefinition(PySymlink.PY2);
484483
builder.addSymlinkDefinition(PySymlink.PY3);
485484

src/main/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitions.java

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

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ java_library(
2929
"//src/main/java/com/google/devtools/build/lib/packages/semantics",
3030
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
3131
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core",
32-
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp",
3332
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/stubs",
3433
"//src/main/java/net/starlark/java/annot",
3534
"//src/main/java/net/starlark/java/eval",

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyBootstrap.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap;
2222
import com.google.devtools.build.lib.starlarkbuildapi.core.ContextAndFlagGuardedValue;
2323
import com.google.devtools.build.lib.starlarkbuildapi.stubs.ProviderStub;
24-
import net.starlark.java.eval.FlagGuardedValue;
2524

2625
/** {@link Bootstrap} for Starlark objects related to the Python rules. */
2726
public class PyBootstrap implements Bootstrap {
@@ -32,11 +31,7 @@ public class PyBootstrap implements Bootstrap {
3231
PackageIdentifier.createUnchecked("rules_python", ""),
3332
PackageIdentifier.createUnchecked("", "tools/build_defs/python"));
3433

35-
private final PyStarlarkTransitionsApi pyStarlarkTransitionsApi;
36-
37-
public PyBootstrap(PyStarlarkTransitionsApi pyStarlarkTransitionsApi) {
38-
this.pyStarlarkTransitionsApi = pyStarlarkTransitionsApi;
39-
}
34+
public PyBootstrap() {}
4035

4136
@Override
4237
public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) {
@@ -55,10 +50,6 @@ public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) {
5550
new ProviderStub(),
5651
allowedRepositories));
5752

58-
builder.put(
59-
"py_transitions",
60-
FlagGuardedValue.onlyWhenExperimentalFlagIsTrue(
61-
BuildLanguageOptions.EXPERIMENTAL_GOOGLE_LEGACY_API, pyStarlarkTransitionsApi));
6253
builder.put(
6354
"PyWrapCcInfo",
6455
ContextAndFlagGuardedValue.onlyInAllowedReposOrWhenIncompatibleFlagIsFalse(

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyStarlarkTransitionsApi.java

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

src/test/java/com/google/devtools/build/lib/rules/python/BUILD

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,6 @@ java_test(
203203
],
204204
)
205205

206-
java_test(
207-
name = "PyStarlarkTransitionsTest",
208-
srcs = ["PyStarlarkTransitionsTest.java"],
209-
deps = [
210-
"//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
211-
"//src/main/java/com/google/devtools/build/lib/cmdline",
212-
"//src/main/java/com/google/devtools/build/lib/packages",
213-
"//src/main/java/com/google/devtools/build/lib/rules/python",
214-
"//src/test/java/com/google/devtools/build/lib/analysis/util",
215-
"//third_party:guava",
216-
"//third_party:junit4",
217-
"//third_party:truth",
218-
],
219-
)
220-
221206
java_test(
222207
name = "PythonStarlarkApiTest",
223208
srcs = ["PythonStarlarkApiTest.java"],

src/test/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitionsTest.java

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

0 commit comments

Comments
 (0)