Merge remote-tracking branch '00-local/2058-collect-system-packages' into develop

Author: pombredanne

setup.py

@@ -181,6 +181,7 @@ def read(*names, **kwargs):
         'typecode_libmagic',
 
         # packagedcode
+        'debut >= 0.9.4',
         'pefile >= 2018.8.8',
         'pymaven_patch >= 0.2.8',
         'requests >= 2.7.0, < 3.0.0',
@@ -190,21 +191,22 @@ def read(*names, **kwargs):
         'toml >= 0.10.0',
         'gemfileparser >= 0.7.0',
         'pkginfo >= 1.5.0.1',
-        'dparse >= 0.4.1',
+        'dparse2',
 
         # used to fix mojibake in Windows PE
         # for now we use the evrsion that works on both Python 2 and 3
         'ftfy <  5.0.0',
 
         # scancode
-        'click >= 6.0.0, < 7.0.0',
+        'click >= 6.0.0',
         'colorama >= 0.3.9',
         'pluggy >= 0.4.0, < 1.0',
-        'attrs >=18.1, !=20.1.0',
+        'attrs >= 18.1, !=20.1.0',
         'typing >=3.6, < 3.7',
 
         # scancode outputs
         'jinja2 >= 2.7.0, < 3.0.0',
+        'MarkupSafe >= 0.23',
         'simplejson',
         'spdx_tools >= 0.6.0',
         'unicodecsv',

src/cluecode/finder.py

@@ -72,7 +72,7 @@ def logger_debug(*args):
 def find(location, patterns):
     """
     Yield match and matched lines for patterns found in file at location as a
-    tuple of (key, found text, text line). Pattern is list of tuples (key,
+    tuple of (key, found text, text line). `patterns` is a list of tuples (key,
     compiled regex).
 
     Note: the location can be a list of lines for testing convenience.

src/licensedcode/data/rules/cc-by-sa-4.0_540.RULE

@@ -0,0 +1 @@
+CC Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/4.0/

src/licensedcode/data/rules/cc-by-sa-4.0_540.yml

@@ -0,0 +1,5 @@
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+    - http://creativecommons.org/licenses/by-sa/4.0

src/licensedcode/data/rules/mongodb-sspl-1.0_30.RULE

@@ -0,0 +1 @@
+licensed under the SSPL, see `https://www.mongodb.com/licensing/server-side-public-license'.

src/licensedcode/data/rules/mongodb-sspl-1.0_30.yml

@@ -0,0 +1,5 @@
+license_expression: mongodb-sspl-1.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+    - https://www.mongodb.com/licensing/server-side-public-license

src/licensedcode/data/rules/mongodb-sspl-1.0_40.RULE

@@ -0,0 +1 @@
+licensed under the SSPL

src/licensedcode/data/rules/mongodb-sspl-1.0_40.yml

@@ -0,0 +1,3 @@
+license_expression: mongodb-sspl-1.0
+is_license_notice: yes
+relevance: 100

src/licensedcode/data/rules/mongodb-sspl-1.0_50.RULE

@@ -0,0 +1,2 @@
+License:
+    SSPL

src/licensedcode/data/rules/mongodb-sspl-1.0_50.yml

@@ -0,0 +1,3 @@
+license_expression: mongodb-sspl-1.0
+is_license_reference: yes
+relevance: 100