Enable --incompatible_no_attr_license by default

Fixes #6420 #7444 RELNOTES: --incompatible_no_attr_license is enabled by default PiperOrigin-RevId: 240617932
bazelbuild · Mar 27, 2019 · ce4b73e · ce4b73e
1 parent 5535538
commit ce4b73e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 35 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -384,7 +384,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
 
   @Option(
       name = "incompatible_no_attr_license",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -220,7 +220,7 @@ public static Builder builderWithDefaults() {
           .incompatibleDisallowStructProviderSyntax(false)
           .incompatibleExpandDirectories(true)
           .incompatibleNewActionsApi(false)
-          .incompatibleNoAttrLicense(false)
+          .incompatibleNoAttrLicense(true)
           .incompatibleNoOutputAttrDefault(false)
           .incompatibleNoSupportToolsInActionInputs(false)
           .incompatibleNoTargetOutputGroup(false)

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
@@ -2806,6 +2806,7 @@ public void testLicenseType() throws Exception {
     // Note that attr.license is deprecated, and thus this test is subject to imminent removal.
     // (See --incompatible_no_attr_license). However, this verifies that until the attribute
     // is removed, values of the attribute are a valid Starlark type.
+    setSkylarkSemanticsOptions("--incompatible_no_attr_license=false");
     scratch.file(
         "test/rule.bzl",
         "def _my_rule_impl(ctx): ",

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -626,7 +626,6 @@ public void testAttrDoc() throws Exception {
     buildAttribute("a4", "attr.label(doc='foo')");
     buildAttribute("a5", "attr.label_keyed_string_dict(doc='foo')");
     buildAttribute("a6", "attr.label_list(doc='foo')");
-    buildAttribute("a7", "attr.license(doc='foo')");
     buildAttribute("a8", "attr.output(doc='foo')");
     buildAttribute("a9", "attr.output_list(doc='foo')");
     buildAttribute("a10", "attr.string(doc='foo')");
@@ -637,14 +636,6 @@ public void testAttrDoc() throws Exception {
 
   @Test
   public void testNoAttrLicense() throws Exception {
-    ev =
-        createEvaluationTestCase(
-            StarlarkSemantics.DEFAULT_SEMANTICS
-                .toBuilder()
-                .incompatibleNoAttrLicense(true)
-                .build());
-    ev.initialize();
-
     EvalException expected = assertThrows(EvalException.class, () -> eval("attr.license()"));
     assertThat(expected)
         .hasMessageThat()
@@ -1025,29 +1016,6 @@ public void testLabelGetRelativeSyntaxError() throws Exception {
         "Label('//foo:bar').relative('bad//syntax')");
   }
 
-  @Test
-  public void testLicenseAttributesNonconfigurable() throws Exception {
-    scratch.file("test/BUILD");
-    scratch.file("test/rule.bzl",
-        "def _impl(ctx):",
-        "  return",
-        "some_rule = rule(",
-        "  implementation = _impl,",
-        "  attrs = {",
-        "    'licenses': attr.license()",
-        "  }",
-        ")");
-    scratch.file("third_party/foo/BUILD",
-        "load('//test:rule.bzl', 'some_rule')",
-        "some_rule(",
-        "    name='r',",
-        "    licenses = ['unencumbered']",
-        ")");
-    invalidatePackages();
-    // Should succeed without a "licenses attribute is potentially configurable" loading error:
-    createRuleContext("//third_party/foo:r");
-  }
-
   @Test
   public void testStructCreation() throws Exception {
     // TODO(fwe): cannot be handled by current testing suite

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java
@@ -354,7 +354,6 @@ public void testStringRepresentations_Attr() throws Exception {
     assertStringRepresentation("attr.output_list()", "<attr.output_list>");
     assertStringRepresentation("attr.string_dict()", "<attr.string_dict>");
     assertStringRepresentation("attr.string_list_dict()", "<attr.string_list_dict>");
-    assertStringRepresentation("attr.license()", "<attr.license>");
   }
 
   @Test