Merge pull request #2759 from petergardfjall/change-notices-to-references

pombredanne · web-flow · commit 1fdf40faabc0 · 2021-11-26T11:19:05.000+01:00
rules with "unqualified" license names are references, not notices
diff --git a/src/licensedcode/data/rules/agpl-3.0-plus_105.yml b/src/licensedcode/data/rules/agpl-3.0-plus_105.yml
@@ -1,3 +1,3 @@
 license_expression: agpl-3.0-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/apache-2.0_136.yml b/src/licensedcode/data/rules/apache-2.0_136.yml
@@ -1,5 +1,5 @@
 license_expression: apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://www.apache.org/licenses/LICENSE-2.0.txt
+  - http://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/src/licensedcode/data/rules/apache-2.0_170.yml b/src/licensedcode/data/rules/apache-2.0_170.yml
@@ -1,5 +1,5 @@
 license_expression: apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://www.apache.org/licenses/
+  - http://www.apache.org/licenses/
diff --git a/src/licensedcode/data/rules/apache-2.0_175.yml b/src/licensedcode/data/rules/apache-2.0_175.yml
@@ -1,3 +1,3 @@
 license_expression: apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/apache-2.0_176.yml b/src/licensedcode/data/rules/apache-2.0_176.yml
@@ -1,3 +1,3 @@
 license_expression: apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/apache-2.0_417.yml b/src/licensedcode/data/rules/apache-2.0_417.yml
@@ -1,3 +1,3 @@
 license_expression: apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 90
diff --git a/src/licensedcode/data/rules/apache-2.0_767.yml b/src/licensedcode/data/rules/apache-2.0_767.yml
@@ -1,5 +1,5 @@
 license_expression: apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://www.apache.org/licenses/
+  - https://www.apache.org/licenses/
diff --git a/src/licensedcode/data/rules/apache-2.0_893.yml b/src/licensedcode/data/rules/apache-2.0_893.yml
@@ -1,5 +1,5 @@
 license_expression: apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://www.apache.org/licenses/LICENSE-2.0.txt
+  - https://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/src/licensedcode/data/rules/bitstream_3.yml b/src/licensedcode/data/rules/bitstream_3.yml
@@ -1,3 +1,3 @@
 license_expression: bitstream
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/bitstream_4.yml b/src/licensedcode/data/rules/bitstream_4.yml
@@ -1,3 +1,3 @@
 license_expression: bitstream
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/bitstream_5.yml b/src/licensedcode/data/rules/bitstream_5.yml
@@ -1,3 +1,3 @@
 license_expression: bitstream
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-2-clause-views_32.yml b/src/licensedcode/data/rules/bsd-2-clause-views_32.yml
@@ -1,5 +1,5 @@
 license_expression: bsd-2-clause-views
-is_license_notice: yes
+is_license_reference: yes
 relevance: 95
 ignorable_urls:
-    - http://www.freebsd.org/copyright/freebsd-license.html
+  - http://www.freebsd.org/copyright/freebsd-license.html
diff --git a/src/licensedcode/data/rules/bsd-2-clause-views_51.yml b/src/licensedcode/data/rules/bsd-2-clause-views_51.yml
@@ -1,5 +1,5 @@
 license_expression: bsd-2-clause-views
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://www.freebsd.org/copyright/freebsd-license.html
+  - http://www.freebsd.org/copyright/freebsd-license.html
diff --git a/src/licensedcode/data/rules/bsd-new_393.yml b/src/licensedcode/data/rules/bsd-new_393.yml
@@ -1,4 +1,4 @@
 license_expression: bsd-new
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/bsd-new_394.yml b/src/licensedcode/data/rules/bsd-new_394.yml
@@ -1,4 +1,4 @@
 license_expression: bsd-new
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/bsd-simplified_161.yml b/src/licensedcode/data/rules/bsd-simplified_161.yml
@@ -1,3 +1,3 @@
 license_expression: bsd-simplified
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-simplified_194.yml b/src/licensedcode/data/rules/bsd-simplified_194.yml
@@ -1,5 +1,5 @@
 license_expression: bsd-simplified
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://www.opensource.org/licenses/bsd-license.php
+  - https://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-simplified_195.yml b/src/licensedcode/data/rules/bsd-simplified_195.yml
@@ -1,5 +1,5 @@
 license_expression: bsd-simplified
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://opensource.org/licenses/bsd-license.php
+  - http://opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-simplified_196.yml b/src/licensedcode/data/rules/bsd-simplified_196.yml
@@ -1,5 +1,5 @@
 license_expression: bsd-simplified
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://opensource.org/licenses/bsd-license.php
+  - https://opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-3.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-nd-3.0_licensebutton.yml
@@ -1,5 +1,5 @@
 license_expression: cc-by-nc-nd-3.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://licensebuttons.net/l/by-nc-nd/3.0
+  - https://licensebuttons.net/l/by-nc-nd/3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.yml
@@ -1,3 +1,3 @@
 license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.yml
@@ -1,5 +1,5 @@
 license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://licensebuttons.net/l/by-nc-sa/3.0
+  - https://licensebuttons.net/l/by-nc-sa/3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.yml
@@ -1,5 +1,5 @@
 license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://licensebuttons.net/l/by-nc-sa/4.0
+  - https://licensebuttons.net/l/by-nc-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_18.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_18.yml
@@ -1,5 +1,5 @@
 license_expression: cc-by-sa-4.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://creativecommons.org/licenses/by-sa/4.0
+  - https://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_19.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_19.yml
@@ -1,3 +1,3 @@
 license_expression: cc-by-sa-4.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_20.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_20.yml
@@ -1,5 +1,5 @@
 license_expression: cc-by-sa-4.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://creativecommons.org/licenses/by-sa/4.0
+  - https://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cmu-uc_7.yml b/src/licensedcode/data/rules/cmu-uc_7.yml
@@ -1,4 +1,4 @@
 license_expression: secret-labs-2011
-is_license_notice: yes
+is_license_reference: yes
 relevance: 99
 minimum_coverage: 90
diff --git a/src/licensedcode/data/rules/ecosrh-1.1_2.yml b/src/licensedcode/data/rules/ecosrh-1.1_2.yml
@@ -1,3 +1,3 @@
 license_expression: ecosrh-1.1
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/elastic-license-2018_4.yml b/src/licensedcode/data/rules/elastic-license-2018_4.yml
@@ -3,6 +3,4 @@ is_license_notice: yes
 relevance: 99
 notes: this could refer to the older elastic-license-2018
 referenced_filenames:
-    - ELASTIC-LICENSE.txt
-
-
+  - ELASTIC-LICENSE.txt
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_20.yml b/src/licensedcode/data/rules/gpl-2.0-plus_20.yml
@@ -1,3 +1,3 @@
 license_expression: gpl-2.0-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/gpl-2.0_617_1.yml b/src/licensedcode/data/rules/gpl-2.0_617_1.yml
@@ -1,8 +1,9 @@
 license_expression: gpl-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 minimum_coverage: 100
-notes: At https://web.archive.org/web/20020809115410/ftp://prep.ai.mit.edu/pub/gnu/GPL the text
-    is a GPL 2.0 license text
+notes:
+  At https://web.archive.org/web/20020809115410/ftp://prep.ai.mit.edu/pub/gnu/GPL the text
+  is a GPL 2.0 license text
 ignorable_urls:
-    - ftp://prep.ai.mit.edu/pub/gnu/GPL
+  - ftp://prep.ai.mit.edu/pub/gnu/GPL
diff --git a/src/licensedcode/data/rules/gpl-2.0_666.yml b/src/licensedcode/data/rules/gpl-2.0_666.yml
@@ -1,3 +1,3 @@
 license_expression: gpl-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/gpl-3.0-plus_309.yml b/src/licensedcode/data/rules/gpl-3.0-plus_309.yml
@@ -1,3 +1,3 @@
 license_expression: gpl-3.0-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/gpl-3.0-plus_77.yml b/src/licensedcode/data/rules/gpl-3.0-plus_77.yml
@@ -1,3 +1,3 @@
 license_expression: gpl-3.0-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/gpl_234.yml b/src/licensedcode/data/rules/gpl_234.yml
@@ -1,3 +1,3 @@
 license_expression: gpl-1.0-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/lgpl-2.0-plus_454.yml b/src/licensedcode/data/rules/lgpl-2.0-plus_454.yml
@@ -1,3 +1,3 @@
 license_expression: lgpl-2.0-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/lgpl-2.0_71.yml b/src/licensedcode/data/rules/lgpl-2.0_71.yml
@@ -1,3 +1,3 @@
 license_expression: lgpl-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/lgpl-2.1-plus_162.yml b/src/licensedcode/data/rules/lgpl-2.1-plus_162.yml
@@ -1,3 +1,3 @@
 license_expression: lgpl-2.1-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/lgpl-2.1-plus_286.yml b/src/licensedcode/data/rules/lgpl-2.1-plus_286.yml
@@ -1,4 +1,4 @@
 license_expression: lgpl-2.1-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 notes: Seen in pacemaker HTML doc
diff --git a/src/licensedcode/data/rules/lgpl-2.1_162.yml b/src/licensedcode/data/rules/lgpl-2.1_162.yml
@@ -1,3 +1,3 @@
 license_expression: lgpl-2.1
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/lgpl-3.0-plus_186.yml b/src/licensedcode/data/rules/lgpl-3.0-plus_186.yml
@@ -1,3 +1,3 @@
 license_expression: lgpl-3.0-plus
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/lgpl-3.0_98.yml b/src/licensedcode/data/rules/lgpl-3.0_98.yml
@@ -1,3 +1,3 @@
 license_expression: lgpl-3.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/lgpl-3.0_99.yml b/src/licensedcode/data/rules/lgpl-3.0_99.yml
@@ -1,3 +1,3 @@
 license_expression: lgpl-3.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/mit_428.yml b/src/licensedcode/data/rules/mit_428.yml
@@ -1,5 +1,5 @@
 license_expression: mit
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://www.opensource.org/licenses/mit-license.php
+  - http://www.opensource.org/licenses/mit-license.php
diff --git a/src/licensedcode/data/rules/mit_429.yml b/src/licensedcode/data/rules/mit_429.yml
@@ -1,5 +1,5 @@
 license_expression: mit
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - https://www.opensource.org/licenses/mit-license.php
+  - https://www.opensource.org/licenses/mit-license.php
diff --git a/src/licensedcode/data/rules/mit_434.yml b/src/licensedcode/data/rules/mit_434.yml
@@ -1,5 +1,5 @@
 license_expression: mit
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://opensource.org/licenses/MIT
+  - http://opensource.org/licenses/MIT
diff --git a/src/licensedcode/data/rules/odbl-1.0_1.yml b/src/licensedcode/data/rules/odbl-1.0_1.yml
@@ -1,5 +1,5 @@
 license_expression: odbl-1.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://www.opendatacommons.org/licenses/odbl/
+  - http://www.opendatacommons.org/licenses/odbl/
diff --git a/src/licensedcode/data/rules/proprietary_greensock_3.yml b/src/licensedcode/data/rules/proprietary_greensock_3.yml
@@ -1,5 +1,5 @@
 license_expression: proprietary-license
-is_license_notice: yes
+is_license_reference: yes
 relevance: 90
 ignorable_urls:
-    - http://greensock.com/standard-license
+  - http://greensock.com/standard-license
diff --git a/src/licensedcode/data/rules/proprietary_greensock_8.yml b/src/licensedcode/data/rules/proprietary_greensock_8.yml
@@ -1,5 +1,5 @@
 license_expression: proprietary-license
-is_license_notice: yes
+is_license_reference: yes
 relevance: 90
 ignorable_urls:
-    - http://www.greensock.com/
+  - http://www.greensock.com/
diff --git a/src/licensedcode/data/rules/public-domain_or_apache-2.0_1.yml b/src/licensedcode/data/rules/public-domain_or_apache-2.0_1.yml
@@ -1,3 +1,3 @@
 license_expression: public-domain OR apache-2.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/redis-source-available-1.0_5.yml b/src/licensedcode/data/rules/redis-source-available-1.0_5.yml
@@ -1,3 +1,3 @@
 license_expression: redis-source-available-1.0
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
diff --git a/src/licensedcode/data/rules/unlicense_25.yml b/src/licensedcode/data/rules/unlicense_25.yml
@@ -1,5 +1,5 @@
 license_expression: unlicense
-is_license_notice: yes
+is_license_reference: yes
 relevance: 100
 ignorable_urls:
-    - http://unlicense.org/
+  - http://unlicense.org/
diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/glib2.0/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/glib2.0/stable_copyright-detailed.expected.yml
@@ -132,8 +132,8 @@ matches:
     identifier: apache-2.0_417.RULE
     license_expression: apache-2.0
     is_license_text: no
-    is_license_notice: yes
-    is_license_reference: no
+    is_license_notice: no
+    is_license_reference: yes
     is_license_tag: no
     is_license_intro: no
     matched_text: the Apache license
@@ -148,8 +148,8 @@ matches:
     identifier: apache-2.0_176.RULE
     license_expression: apache-2.0
     is_license_text: no
-    is_license_notice: yes
-    is_license_reference: no
+    is_license_notice: no
+    is_license_reference: yes
     is_license_tag: no
     is_license_intro: no
     matched_text: |
diff --git a/tests/summarycode/data/score/spdx_licenses-expected.json b/tests/summarycode/data/score/spdx_licenses-expected.json
@@ -12,7 +12,7 @@
         "--license-clarity-score": true
       },
       "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
-      "output_format_version": "1.0.0",
+      "output_format_version": "2.0.0",
       "message": null,
       "errors": [],
       "extra_data": {
@@ -339,8 +339,8 @@
             ],
             "referenced_filenames": [],
             "is_license_text": false,
-            "is_license_notice": true,
-            "is_license_reference": false,
+            "is_license_notice": false,
+            "is_license_reference": true,
             "is_license_tag": false,
             "is_license_intro": false,
             "has_unknown": false,
