Fixed False Positive detection for amazon-sl license by adding rules…

… for mit license and updating rules for amazon-sl license. issue aboutcode-org#4022 Signed-off-by: Aayush Kumar <[email protected]>
aayushkdev · Jan 17, 2025 · 920b3e0 · 920b3e0
1 parent b0aff52
commit 920b3e0
Show file tree

Hide file tree

Showing 27 changed files with 58 additions and 1,469 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -233,8 +233,8 @@ jobs:
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: macos14_cpython_latest_from_pip
-          image_name: macos-14
+          job_name: macos12_cpython_latest_from_pip
+          image_name: macos-12
           python_versions: ['3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py

diff --git a/configure b/configure
@@ -211,7 +211,7 @@ find_python() {
         if [ -f "$CFG_ROOT_DIR/PYTHON_EXECUTABLE" ]; then
             PYTHON_EXECUTABLE=$(cat "$CFG_ROOT_DIR/PYTHON_EXECUTABLE")
         else
-            PYTHON_EXECUTABLE=python3
+            PYTHON_EXECUTABLE=python3.9
         fi
     fi
 }

diff --git a/src/licensedcode/data/rules/amazon-sl_8.RULE b/src/licensedcode/data/rules/amazon-sl_8.RULE
@@ -6,4 +6,4 @@ relevance: 100
 
 License
 
-This library is licensed under the Amazon Software License.
+This library is licensed under the {{Amazon Software License}}.
diff --git a/src/licensedcode/data/rules/mit_1351.RULE b/src/licensedcode/data/rules/mit_1351.RULE
@@ -0,0 +1,7 @@
+---
+license_expression: mit
+is_license_notice: yes
+relevance: 100
+---
+
+This library is licensed under The {{MIT License (MIT)}}
diff --git a/src/licensedcode/data/rules/mit_1352.RULE b/src/licensedcode/data/rules/mit_1352.RULE
@@ -0,0 +1,7 @@
+---
+license_expression: mit
+is_license_notice: yes
+relevance: 100
+---
+
+This library is licensed under The {{MIT}}
diff --git a/src/licensedcode/data/rules/mit_1353.RULE b/src/licensedcode/data/rules/mit_1353.RULE
@@ -0,0 +1,7 @@
+---
+license_expression: mit
+is_license_notice: yes
+relevance: 100
+---
+
+This library is licensed under The {{MIT License}}
diff --git a/src/licensedcode/data/rules/mit_1354.RULE b/src/licensedcode/data/rules/mit_1354.RULE
@@ -0,0 +1,27 @@
+---
+license_expression: mit
+is_license_notice: yes
+relevance: 100
+---
+
+MIT License
+
+Copyright (c) 2016 Jia PengHui
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/packagedcode/__init__.py b/src/packagedcode/__init__.py
@@ -73,7 +73,6 @@
     cocoapods.PodfileLockHandler,
     cocoapods.PodfileHandler,
 
-    conda.CondaMetaJsonHandler,
     conda.CondaMetaYamlHandler,
     conda.CondaYamlHandler,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ relevance: 100

		License

		This library is licensed under the Amazon Software License.
		This library is licensed under the {{Amazon Software License}}.