Merge branch 'develop' into improve-license-detection

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

CHANGELOG.rst

@@ -46,6 +46,9 @@ v33.0.0 (next next, roadmap)
 - Update ABOUT files to adapt the ABOUT File Specification.
   See https://github.com/aboutcode-org/scancode-toolkit/issues/4181
 
+- Also return sha1_git checksums for each files with ``--info`` plugin.
+  https://github.com/aboutcode-org/scancode-toolkit/issues/624
+
 
 v32.3.3 - 2025-03-06
 --------------------

azure-pipelines.yml

@@ -203,7 +203,7 @@ jobs:
           python_architecture: x64
           test_suites:
               click_versions: |
-                for clk_ver in 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.3 8.0.2 8.0.1 7.1.2 7.1.1 7.1 6.7;
+                for clk_ver in 8.2.0 8.2.1 8.1.7 8.1.6 8.1.5 8.1.4 8.1.3 8.1.2 8.1.1 8.1.0 8.0.4 8.0.2 8.0.3 8.0.1 7.1.2 7.1.1 7.1 6.7;
                  do
                   venv/bin/pip install click==$clk_ver;
                   venv/bin/scancode -i samples/ -n3 --json foo.json;

docs/source/cli-reference/output-format.rst

@@ -141,6 +141,7 @@ following options.
           "date": "2019-02-12",
           "sha1": "fca4540d490fff36bb90fd801cf9cd8fc695bb17",
           "md5": "a980b61c1e8be68d5cdb1236ba6b43e7",
+          "sha1_git": "d9a10c0d8e868ebf8da0b3dc95bb0be634c34bfe",
           "mime_type": "text/x-c++",
           "file_type": "C++ source, ASCII text",
           "programming_language": "C++",
@@ -481,6 +482,7 @@ Comparing Different ``json`` Output Formats
         - size,
         - sha1,
         - md5,
+        - sha1_git,
         - files_count,
         - mime_type,
         - file_type,

docs/source/cli-reference/scan-options-post.rst

@@ -1060,6 +1060,7 @@ To see all plugins available via command line help, use ``--plugins``.
             "sha1": null,
             "md5": null,
             "sha256": null,
+            "sha1_git": null,
             "mime_type": null,
             "file_type": null,
             "programming_language": null,

docs/source/cli-reference/synopsis.rst

@@ -156,6 +156,7 @@ A sample JSON output file structure will look like::
           "date": "2019-02-12",
           "sha1": "2e07e32c52d607204fad196052d70e3d18fb8636",
           "md5": "effc6856ef85a9250fb1a470792b3f38",
+          "sha1_git": "d9a10c0d8e868ebf8da0b3dc95bb0be634c34bfe",
           "mime_type": "text/plain",
           "file_type": "ASCII text",
           "programming_language": null,

requirements.txt

@@ -8,9 +8,10 @@ certifi==2024.2.2
 cffi==1.16.0
 chardet==5.0.0
 charset-normalizer==2.1.0
-click==8.1.7
+click==8.2.1;python_version>='3.10'
+click==8.1.7;python_version<'3.10'
 colorama==0.4.5
-commoncode==32.2.1
+commoncode==32.3.0
 construct==2.10.68
 container-inspector==31.1.0
 cryptography==42.0.5

setup-mini.cfg

@@ -67,9 +67,10 @@ install_requires =
     Beautifulsoup4[chardet] >= 4.13.0
     boolean.py >= 4.0
     chardet >= 3.0.0
-    click >= 6.7, !=7.0, !=8.1.8
+    click >= 6.7, !=7.0, !=8.1.8;python_version<'3.10'
+    click >= 8.2.0;python_version>='3.10'
     colorama >= 0.3.9
-    commoncode >= 32.2.1
+    commoncode >= 32.3.0
     container-inspector >= 31.0.0
     debian-inspector >= 31.1.0
     dparse2 >= 0.7.0

setup.cfg

@@ -67,9 +67,10 @@ install_requires =
     Beautifulsoup4[chardet] >= 4.13.0
     boolean.py >= 4.0
     chardet >= 3.0.0
-    click >= 6.7, !=7.0, !=8.1.8
+    click >= 6.7, !=7.0, !=8.1.8;python_version<'3.10'
+    click >= 8.2.0;python_version>='3.10'
     colorama >= 0.3.9
-    commoncode >= 32.2.1
+    commoncode >= 32.3.0
     container-inspector >= 31.0.0
     debian-inspector >= 31.1.0
     dparse2 >= 0.7.0

src/licensedcode/data/licenses/code-credit-license-1.0-0.LICENSE renamed to src/licensedcode/data/licenses/code-credit-license-1.0.0.LICENSE

@@ -1,5 +1,5 @@
 ---
-key: code-credit-license-1.0-0
+key: code-credit-license-1.0.0
 short_name: Code Credit License v1.0.0
 name: Code Credit License v1.0.0
 category: Permissive
@@ -114,4 +114,4 @@ No contributor can revoke this license.
 ***As far as the law allows, this software comes as is,
 without any warranty or condition, and no contributor
 will be liable to anyone for any damages related to this
-software or this license, under any kind of legal claim.***
+software or this license, under any kind of legal claim.***

src/licensedcode/data/licenses/liliq-r-1.1.LICENSE

@@ -2,7 +2,7 @@
 key: liliq-r-1.1
 language: fr
 short_name: LiLiQ-R-1.1
-name: Licence Libre du Québec – Réciprocité version 1.
+name: Licence Libre du Québec – Réciprocité version 1.1
 category: Copyleft Limited
 owner: Quebec
 homepage_url: https://opensource.org/licenses/LiLiQ-R-1.1