Merge pull request #1828 from nexB/11-01-license-updates

Update license detection

Author: pombredanne

src/formattedcode/output_spdx.py

@@ -51,7 +51,6 @@
 from spdx.utils import SPDXNone
 from spdx.version import Version
 
-from commoncode.system import py2
 from plugincode.output import output_impl
 from plugincode.output import OutputPlugin
 from scancode import CommandLineOption

src/licensedcode/data/licenses/unlicense.yml

@@ -11,4 +11,3 @@ text_urls:
 faq_url: http://unlicense.org/
 ignorable_urls:
     - http://unlicense.org/
-    - https://unlicense.org/

src/licensedcode/data/rules/afl-3.0_12.RULE

@@ -0,0 +1,2 @@
+license": [
+   "AFL-3.0"

src/licensedcode/data/rules/afl-3.0_12.yml

@@ -0,0 +1,3 @@
+license_expression: afl-3.0
+is_license_tag: yes
+relevance: 100

src/licensedcode/data/rules/afl-3.0_13.RULE

@@ -0,0 +1,12 @@
+* NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+
+ * @license   https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)

src/licensedcode/data/rules/afl-3.0_13.yml

@@ -0,0 +1,7 @@
+license_expression: afl-3.0
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+    - LICENSE.txt
+ignorable_urls:
+    - https://opensource.org/licenses/afl-3.0.php

src/licensedcode/data/rules/afl-3.0_14.RULE

@@ -0,0 +1,10 @@
+* This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+
+ * @license   https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)

src/licensedcode/data/rules/afl-3.0_14.yml

@@ -0,0 +1,7 @@
+license_expression: afl-3.0
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+    - LICENSE.txt
+ignorable_urls:
+    - https://opensource.org/licenses/afl-3.0.php

src/licensedcode/data/rules/afl-3.0_15.RULE

@@ -0,0 +1,9 @@
+* NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.

src/licensedcode/data/rules/afl-3.0_15.yml

@@ -0,0 +1,7 @@
+license_expression: afl-3.0
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+    - LICENSE.txt
+ignorable_urls:
+    - https://opensource.org/licenses/afl-3.0.php