Merge branch 'nexB:develop' into add_new_flag

Author: akugarg

requirements.txt

@@ -13,7 +13,7 @@ commoncode==21.6.11
 cryptography==3.4.7
 debian-inspector==21.5.25
 dparse==0.5.1
-extractcode==21.6.1
+extractcode==21.6.2
 extractcode-7z==16.5.210531
 extractcode-libarchive==3.5.1.210531
 fasteners==0.16
@@ -30,7 +30,7 @@ jaraco.functools==3.3.0
 javaproperties==0.8.0
 Jinja2==3.0.1
 jsonstreams==0.6.0
-license-expression==1.2
+license-expression==21.6.14
 lxml==4.6.3
 MarkupSafe==2.0.1
 more-itertools==8.8.0
@@ -58,6 +58,7 @@ requests==2.25.1
 rpm-inspector-rpm==4.16.1.3.210404
 saneyaml==0.5.2
 setuptools==57.0.0
+setuptools_scm==6.0.1
 six==1.16.0
 sortedcontainers==2.4.0
 soupsieve==2.2.1

setup.cfg

@@ -73,7 +73,7 @@ install_requires =
     javaproperties >= 0.5
     jinja2 >= 2.7.0, < 4.0.0
     jsonstreams >= 0.5.0
-    license_expression >= 1.0
+    license_expression >= 21.6.14
     lxml >= 4.6.3, < 5.0.0
     MarkupSafe >= 1.0
     packageurl_python >= 0.9.0

src/licensedcode/data/rules/apache-2.0_919.RULE

@@ -0,0 +1,3 @@
+Comment: On Debian systems the complete license text is available in
+ /usr/share/common-licenses/Apache-2.0
+

src/licensedcode/data/rules/apache-2.0_919.yml

@@ -0,0 +1,4 @@
+license_expression: apache-2.0
+is_license_reference: yes
+referenced_filenames:
+    - /usr/share/common-licenses/Apache-2.0

src/licensedcode/data/rules/apache-2.0_920.RULE

@@ -0,0 +1 @@
+On Debian systems the complete text of the license can be found in  /usr/share/common-licenses/Apache-2.0

src/licensedcode/data/rules/apache-2.0_920.yml

@@ -0,0 +1,4 @@
+license_expression: apache-2.0
+is_license_reference: yes
+referenced_filenames:
+    - /usr/share/common-licenses/Apache-2.0

src/licensedcode/data/rules/apache-2.0_921.RULE

@@ -0,0 +1,3 @@
+License: Apache-2.0
+ On Debian systems the complete text of the license can be found in
+ /usr/share/common-licenses/Apache-2.0

src/licensedcode/data/rules/apache-2.0_921.yml

@@ -0,0 +1,5 @@
+license_expression: apache-2.0
+is_license_notice: yes
+referenced_filenames:
+    - /usr/share/common-licenses/Apache-2.0
+

src/licensedcode/data/rules/apache-2.0_922.RULE

@@ -0,0 +1,15 @@
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+
+License: Apache-2.0
+ On Debian systems the complete text of the license can be found in
+ /usr/share/common-licenses/Apache-2.0

src/licensedcode/data/rules/apache-2.0_922.yml

@@ -0,0 +1,6 @@
+license_expression: apache-2.0
+is_license_notice: yes
+referenced_filenames:
+    - /usr/share/common-licenses/Apache-2.0
+ignorable_urls:
+    - http://www.apache.org/licenses/LICENSE-2.0