diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 684b6e17c5..13fc499b14 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -38,6 +38,8 @@ v33.0.0 (next next, roadmap) - Update Dockerfile and test container build. See https://github.com/aboutcode-org/scancode-toolkit/issues/3955 +- Update ABOUT files to adapt the ABOUT File Specification. + See https://github.com/aboutcode-org/scancode-toolkit/issues/4181 v32.3.3 - 2025-03-06 -------------------- diff --git a/scancode-toolkit.ABOUT b/scancode-toolkit.ABOUT index a20af7ea64..f619eea9c6 100644 --- a/scancode-toolkit.ABOUT +++ b/scancode-toolkit.ABOUT @@ -5,4 +5,5 @@ copyright: Copyright (c) nexB Inc. and others. homepage_url: https://www.aboutcode.org/ vcs_url: git+https://github.com/nexB/scancode-toolkit bug_tracking_url: https://github.com/nexB/scancode-toolkit/issues -notice_file: NOTICE \ No newline at end of file +notice_file: NOTICE +package_url: pkg:pypi/scancode-toolkit diff --git a/src/formattedcode/templates/html-app/assets/DataTables.ABOUT b/src/formattedcode/templates/html-app/assets/DataTables.ABOUT index decb2bab25..dd6d54f62e 100644 --- a/src/formattedcode/templates/html-app/assets/DataTables.ABOUT +++ b/src/formattedcode/templates/html-app/assets/DataTables.ABOUT @@ -3,11 +3,17 @@ download_url: https://codeload.github.com/DataTables/DataTables/zip/1.10.9 version: 1.10.9 name: jQuery -home_url: https://www.datatables.net/ +homepage_url: https://www.datatables.net/ owner: SpryMedia Limited copyright: Copyright (c) 2008-2013 SpryMedia Limited -license_url: https://github.com/DataTables/DataTables/blob/1.10.9/license.txt -dje_license: mit -license_text_file: DataTables.LICENSE -notes: DataTables images are also included in /images directory. \ No newline at end of file +license_expression: mit +licenses: + - key: mit + name: MIT License + file: DataTables.LICENSE + url: https://github.com/DataTables/DataTables/blob/1.10.9/license.txt + spdx_license_key: MIT +notes: DataTables images are also included in /images directory. + +package_url: pkg:github/DataTables/DataTables@1.10.9 diff --git a/src/formattedcode/templates/html-app/assets/bootstrap-fonts.ABOUT b/src/formattedcode/templates/html-app/assets/bootstrap-fonts.ABOUT index 3d7644b248..e4ba0e3b9a 100644 --- a/src/formattedcode/templates/html-app/assets/bootstrap-fonts.ABOUT +++ b/src/formattedcode/templates/html-app/assets/bootstrap-fonts.ABOUT @@ -1,12 +1,16 @@ -about_resource: bootstrap.min.css +about_resource: fonts + download_url: https://github.com/twbs/bootstrap/tree/v3.3.4/dist version: 3.3.4 name: Bootstrap -home_url: http://twitter.github.com/bootstrap/ -owner: Twitter, Inc. -contact: https://twitter.com/about/contact -dje_license: mit -license_text_file: bootstrap.LICENSE +homepage_url: http://getbootstrap.com + +license_expression: mit +licenses: +- file: mit.LICENSE + key: mit + name: MIT License + copyright: Copyright (c) 2011-2015 Twitter, Inc -notes: Bootstrap files are also included in /fonts directory. \ No newline at end of file +package_url: pkg:github/twbs/bootstrap@3.3.4 diff --git a/src/formattedcode/templates/html-app/assets/bootstrap.min.css.ABOUT b/src/formattedcode/templates/html-app/assets/bootstrap.min.css.ABOUT index ea516d74b1..2590876101 100644 --- a/src/formattedcode/templates/html-app/assets/bootstrap.min.css.ABOUT +++ b/src/formattedcode/templates/html-app/assets/bootstrap.min.css.ABOUT @@ -1,15 +1,18 @@ -about_resource: fonts - +about_resource: bootstrap.min.css download_url: https://github.com/twbs/bootstrap/tree/v3.3.4/dist version: 3.3.4 name: Bootstrap -homepage_url: http://getbootstrap.com - +homepage_url: http://twitter.github.com/bootstrap/ +owner: Twitter, Inc. +contact: https://twitter.com/about/contact license_expression: mit licenses: -- file: mit.LICENSE - key: mit + - key: mit name: MIT License - + file: mit.LICENSE + url: https://scancode-licensedb.aboutcode.org/mit.LICENSE + spdx_license_key: MIT copyright: Copyright (c) 2011-2015 Twitter, Inc +notes: Bootstrap files are also included in /fonts directory. +package_url: pkg:github/twbs/bootstrap@3.3.4 diff --git a/src/formattedcode/templates/html-app/assets/bootstrap.min.js.ABOUT b/src/formattedcode/templates/html-app/assets/bootstrap.min.js.ABOUT index 27e843717a..c20fdc5119 100644 --- a/src/formattedcode/templates/html-app/assets/bootstrap.min.js.ABOUT +++ b/src/formattedcode/templates/html-app/assets/bootstrap.min.js.ABOUT @@ -13,3 +13,4 @@ licenses: name: MIT License copyright: Copyright (c) 2011-2015 Twitter, Inc +package_url: pkg:github/twbs/bootstrap@3.3.4 diff --git a/src/formattedcode/templates/html-app/assets/d3.min.js.ABOUT b/src/formattedcode/templates/html-app/assets/d3.min.js.ABOUT index 4aeb397caa..acb74efe81 100644 --- a/src/formattedcode/templates/html-app/assets/d3.min.js.ABOUT +++ b/src/formattedcode/templates/html-app/assets/d3.min.js.ABOUT @@ -19,3 +19,4 @@ owner: Mike Bostock owner_url: http://bost.ocks.org/mike/ vcs_url: https://github.com/d3/d3 version: 3.5.9 +package_url: pkg:github/d3/d3@3.5.9 diff --git a/src/formattedcode/templates/html-app/assets/html5shiv.ABOUT b/src/formattedcode/templates/html-app/assets/html5shiv.ABOUT index 5041ff565d..8c3f807da2 100644 --- a/src/formattedcode/templates/html-app/assets/html5shiv.ABOUT +++ b/src/formattedcode/templates/html-app/assets/html5shiv.ABOUT @@ -3,10 +3,15 @@ download_url: https://github.com/aFarkas/html5shiv/archive/3.7.0.zip version: 3.7.0 name: HTML5 Shiv -home_url: https://github.com/aFarkas/html5shiv/tree/3.7.0 +homepage_url: https://github.com/aFarkas/html5shiv/tree/3.7.0 owner: Alexander Farkas copyright: Copyright (c) 2014 Alexander Farkas (aFarkas). -license_url: https://raw.githubusercontent.com/aFarkas/html5shiv/master/MIT%20and%20GPL2%20licenses.md -dje_license: mit -license_text_file: html5shiv.LICENSE \ No newline at end of file +license_expression: mit +licenses: + - key: mit + name: MIT License + file: html5shiv.LICENSE + url: https://raw.githubusercontent.com/aFarkas/html5shiv/master/MIT%20and%20GPL2%20licenses.md + spdx_license_key: MIT +package_url: pkg:github/aFarkas/html5shiv@3.7.0 diff --git a/src/formattedcode/templates/html-app/assets/jquery.ABOUT b/src/formattedcode/templates/html-app/assets/jquery.ABOUT index 7c44ed6d92..c2d7b91bb8 100644 --- a/src/formattedcode/templates/html-app/assets/jquery.ABOUT +++ b/src/formattedcode/templates/html-app/assets/jquery.ABOUT @@ -3,10 +3,16 @@ download_url: https://github.com/jquery/jquery/archive/1.11.2.zip version: 2.1.3 name: jQuery -home_url: http://jquery.com/ +homepage_url: http://jquery.com/ owner: jQuery Foundation, Inc. copyright: Copyright 2014 jQuery Foundation and other contributors -license_url: https://raw.githubusercontent.com/jquery/jquery/2.1.3/MIT-LICENSE.txt -dje_license: mit -license_text_file: jquery.LICENSE \ No newline at end of file +license_expression: mit +licenses: + - key: mit + name: MIT License + file: jquery.LICENSE + url: https://raw.githubusercontent.com/jquery/jquery/2.1.3/MIT-LICENSE.txt + spdx_license_key: MIT + +package_url: pkg:github/jquery/jquery@2.1.3 diff --git a/src/formattedcode/templates/html-app/assets/jstree.ABOUT b/src/formattedcode/templates/html-app/assets/jstree.ABOUT index 59820d584a..76c45566ff 100644 --- a/src/formattedcode/templates/html-app/assets/jstree.ABOUT +++ b/src/formattedcode/templates/html-app/assets/jstree.ABOUT @@ -3,11 +3,17 @@ download_url: https://github.com/vakata/jstree/archive/3.1.1.zip version: 3.1.1 name: jsTree -home_url: http://www.jstree.com/ +homepage_url: http://www.jstree.com/ owner: Ivan Bozhanov copyright: Copyright (c) 2014 Ivan Bozhanov -license_url: https://raw.githubusercontent.com/vakata/jstree/3.1.1/LICENSE-MIT -dje_license: mit -license_text_file: jstree.LICENSE -notes: the files throbber.gif, style.min.css and 32px.png are also from jstree. \ No newline at end of file +license_expression: mit +licenses: + - key: mit + name: MIT License + file: jstree.LICENSE + url: https://raw.githubusercontent.com/vakata/jstree/3.1.1/LICENSE-MIT + spdx_license_key: MIT +notes: the files throbber.gif, style.min.css and 32px.png are also from jstree. + +package_url: pkg:github/vakata/jstree@3.1.1 diff --git a/src/formattedcode/templates/html-app/assets/respond.ABOUT b/src/formattedcode/templates/html-app/assets/respond.ABOUT index 63ffcecd15..c557d2bee5 100644 --- a/src/formattedcode/templates/html-app/assets/respond.ABOUT +++ b/src/formattedcode/templates/html-app/assets/respond.ABOUT @@ -3,10 +3,16 @@ download_url: https://github.com/scottjehl/Respond/archive/1.4.2.tar.gz version: 1.4.2 name: Respond.js -home_url: https://github.com/scottjehl/Respond/tree/1.4.2 +homepage_url: https://github.com/scottjehl/Respond/tree/1.4.2 owner: Scott Jehl copyright: Copyright (c) 2012 Scott Jehl -license_url: https://raw.githubusercontent.com/scottjehl/Respond/1.4.2/LICENSE-MIT -dje_license: mit -license_text_file: respond.LICENSE \ No newline at end of file +license_expression: mit +licenses: + - key: mit + name: MIT License + file: respond.LICENSE + url: https://raw.githubusercontent.com/scottjehl/Respond/1.4.2/LICENSE-MIT + spdx_license_key: MIT + +package_url: pkg:github/scottjehl/Respond@1.4.2 diff --git a/src/formattedcode/templates/html-app/assets/simple-sidebar.ABOUT b/src/formattedcode/templates/html-app/assets/simple-sidebar.ABOUT index 1589c2842c..b8838ccdc0 100644 --- a/src/formattedcode/templates/html-app/assets/simple-sidebar.ABOUT +++ b/src/formattedcode/templates/html-app/assets/simple-sidebar.ABOUT @@ -3,10 +3,16 @@ download_url: https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/ version: 1.0.5 name: Start Bootstrap - Simple Sidebar -home_url: http://startbootstrap.com/template-overviews/simple-sidebar/ +homepage_url: http://startbootstrap.com/template-overviews/simple-sidebar/ owner: Iron Summit Media Strategies, LLC copyright: Copyright 2013-2015 Iron Summit Media Strategies, LLC. -license_url: https://raw.githubusercontent.com/BlackrockDigital/startbootstrap-simple-sidebar/v1.0.5/LICENSE -dje_license: apache-2.0 -license_text_file: simple-sidebar.LICENSE \ No newline at end of file +license_expression: apache-2.0 +licenses: + - key: apache-2.0 + name: Apache 2.0 + file: simple-sidebar.LICENSE + url: https://raw.githubusercontent.com/BlackrockDigital/startbootstrap-simple-sidebar/v1.0.5/LICENSE + spdx_license_key: Apache-2.0 + +package_url: pkg:github/BlackrockDigital/startbootstrap-simple-sidebar@1.0.5 diff --git a/src/licensedcode/data/scancode-data.ABOUT b/src/licensedcode/data/scancode-data.ABOUT index d05e3afe7d..492ed5e878 100644 --- a/src/licensedcode/data/scancode-data.ABOUT +++ b/src/licensedcode/data/scancode-data.ABOUT @@ -1,6 +1,11 @@ about_resource: . name: ScanCode datasets license_expression: cc-by-4.0 +licenses: + - key: cc-by-4.0 + name: CC-BY-4.0 + file: cc-by-4.0.LICENSE + copyright: copyright (c) nexb Inc. and others. notes: | the preferred attribution notice for data is: @@ -8,5 +13,6 @@ notes: | ScanCode is a trademark of nexB Inc. SPDX-License-Identifier: CC-BY-4.0 See https://creativecommons.org/licenses/by/4.0/legalcode for the license text. - See https://github.com/nexB/scancode-toolkit for support or download. + See https://github.com/nexB/scancode-toolkit for support or download. See https://aboutcode.org for more information about nexB OSS projects. +package_url: pkg:github/aboutcode-org/scancode-toolkit#licensedcode/data diff --git a/src/licensedcode/dmp.py.ABOUT b/src/licensedcode/dmp.py.ABOUT index 16975fb7ec..4f9182f1d8 100644 --- a/src/licensedcode/dmp.py.ABOUT +++ b/src/licensedcode/dmp.py.ABOUT @@ -16,3 +16,5 @@ license_expression: apache-2.0 licenses: - file: dmp.py.LICENSE key: apache-2.0 + +package_url: pkg:github/google/diff-match-patch@a6367d7 diff --git a/src/licensedcode/seq.py.ABOUT b/src/licensedcode/seq.py.ABOUT index 7bf2d9b854..cdee282ffd 100644 --- a/src/licensedcode/seq.py.ABOUT +++ b/src/licensedcode/seq.py.ABOUT @@ -1,5 +1,5 @@ about_resource: seq.py -version: 3.5 + download_url: https://hg.python.org/cpython/raw-file/0a69b1e8b7fe/Lib/difflib.py name: Python difflib diff --git a/src/licensedcode/spans.py.ABOUT b/src/licensedcode/spans.py.ABOUT index 27ad909c9d..a230aa25dd 100644 --- a/src/licensedcode/spans.py.ABOUT +++ b/src/licensedcode/spans.py.ABOUT @@ -1,12 +1,12 @@ about_resource: spans.py -version: 2.4.1 +version: 2.4.1 name: Whoosh Spans vcs_url: hg+https://bitbucket.org/mchaput/whoosh@72e06bd0aac8 -home_url: https://bitbucket.org/mchaput/whoosh +homepage_url: https://bitbucket.org/mchaput/whoosh owner: Matt Chaput copyright: Copyright (c) 2011 Matt Chaput. -download_url: https://bitbucket.org/mchaput/whoosh/get/2.4.1.tar.gz -description: Manage spans of tokens and text. +download_url: https://files.pythonhosted.org/packages/55/6c/c2ef99a8c851010b0700bf3ee036184911762b1146177be543fe17f39d52/Whoosh-2.4.1.tar.gz +description: Manage spans of tokens and text. This file was originally copied and modified from Whoosh. license_expression: bsd-simplified @@ -14,3 +14,5 @@ license_expression: bsd-simplified licenses: - file: spans.py.LICENSE key: bsd-simplified + +package_url: pkg:pypi/Whoosh@2.4.1 diff --git a/src/packagedcode/bashlex.py.ABOUT b/src/packagedcode/bashlex.py.ABOUT index 450b8367b4..e06b9f4a3f 100644 --- a/src/packagedcode/bashlex.py.ABOUT +++ b/src/packagedcode/bashlex.py.ABOUT @@ -7,6 +7,6 @@ homepage_url: http://pygments.org/ license_expression: bsd-simplified name: bashlex.py notice_file: bashlex.py.NOTICE -package_url: pkg:generic/bashlex.py + primary_language: Python notes: this is a derived and heavily modified Pygments bash lexer diff --git a/src/packagedcode/nevra.py.ABOUT b/src/packagedcode/nevra.py.ABOUT index f4ba360a4d..26a4472971 100644 --- a/src/packagedcode/nevra.py.ABOUT +++ b/src/packagedcode/nevra.py.ABOUT @@ -1,8 +1,8 @@ about_resource: nevra.py name: rpmhelper.py -home_url: https://github.com/sassoftware/conary +homepage_url: https://github.com/sassoftware/conary download_url: https://raw.githubusercontent.com/sassoftware/conary/c26507001b62b0839539908cc5bf28893c45c0b4/conary/rpmhelper.py license_text_file: nevra.py.LICENSE notice_file: nevra.py.NOTICE copyright: Copyright (c) SAS Institute Inc. -license_expression: apache-2.0 \ No newline at end of file +license_expression: apache-2.0 diff --git a/src/packagedcode/pypi.py.ABOUT b/src/packagedcode/pypi.py.ABOUT index aa64a4d061..e4083f7b11 100644 --- a/src/packagedcode/pypi.py.ABOUT +++ b/src/packagedcode/pypi.py.ABOUT @@ -1,7 +1,6 @@ about_resource: pypi.py name: pyserial namespace: pyserial -package_url: pkg:github/pyserial/pyserial@d867871e6aa33301#setup.py attribute: yes copyright: Copyright (c) 2001-2020 Chris Liechti download_url: https://github.com/pyserial/pyserial/blob/d867871e6aa333014a77498b4ac96fdd1d3bf1d8/setup.py#L34 diff --git a/src/packagedcode/pypi_setup_py.py.ABOUT b/src/packagedcode/pypi_setup_py.py.ABOUT index 0e1ef90e8b..29f1bb746d 100644 --- a/src/packagedcode/pypi_setup_py.py.ABOUT +++ b/src/packagedcode/pypi_setup_py.py.ABOUT @@ -4,5 +4,5 @@ author: Gram (@orsinium) author_email: gram@orsinium.dev homepage_url: https://github.com/dephell/dephell_setuptools license_expression: mit -package_url: pkg:github/dephell/dephell_setuptools@v.0.2.4 -notes: code heavily modified from original \ No newline at end of file + +notes: code heavily modified from original diff --git a/src/packagedcode/pyrpm.py.ABOUT b/src/packagedcode/pyrpm.py.ABOUT index 0004676db1..b4c15dfc76 100644 --- a/src/packagedcode/pyrpm.py.ABOUT +++ b/src/packagedcode/pyrpm.py.ABOUT @@ -3,8 +3,10 @@ name: pyrpm version: ca1c91d03dd7da2504f6205276cfc0eb0d197395 download_url: https://github.com/mjvm/pyrpm/archive/ca1c91d03dd7da2504f6205276cfc0eb0d197395.zip vcs_repository: https://github.com/mjvm/pyrpm.git -license: bsd-simplified -license_text: pyrpm.py.LICENSE +license_expression: bsd-simplified +licenses: +- file: pyrpm.py.LICENSE + key: bsd-simplified owner: Mário Morgado description: PyRPM is a pure python module to extract information from a RPM package. -notes: heavily modified \ No newline at end of file +notes: heavily modified diff --git a/src/scancode/interrupt-robotframework.ABOUT b/src/scancode/interrupt-robotframework.ABOUT index 7e938d7edf..1fb2301d13 100644 --- a/src/scancode/interrupt-robotframework.ABOUT +++ b/src/scancode/interrupt-robotframework.ABOUT @@ -3,11 +3,16 @@ version: 3.0.2 download_url: https://pypi.python.org/packages/3e/79/d8b9a7ea833cf4f33d51c0d5f24b825ac72105bf30c147b472da10895143/robotframework-3.0.2.tar.gz#md5=ea49a54b9d7e38302712194e85c37eaa name: robotframework -home_url: http://robotframework.org/ +homepage_url: http://robotframework.org/ owner: Robot Framework Foundation -dje_license: apache-2.0 notice_file: interrupt-robotframework.NOTICE -license_text_file: apache-2.0.LICENSE +license_expression: apache-2.0 +licenses: + - key: apache-2.0 + name: Apache 2.0 + file: apache-2.0.LICENSE + url: https://scancode-licensedb.aboutcode.org/apache-2.0.LICENSE + spdx_license_key: Apache-2.0 copyright: Copyright 2008-2015 Nokia Networks Copyright 2016- Robot Framework Foundation diff --git a/src/scancode/outdated.ABOUT b/src/scancode/outdated.ABOUT index 5ecc8b8421..acb1fe3db0 100644 --- a/src/scancode/outdated.ABOUT +++ b/src/scancode/outdated.ABOUT @@ -2,7 +2,14 @@ about_resource: outdated.py name: pip version: 9974f2 download_url: https://raw.githubusercontent.com/pypa/pip/9974f274e1c86fb556b5d51dcfd2d4dc637b7b67/pip/utils/outdated.py -license: mit + +copyright: Copyright (c) 2008-2014 The pip developers notice_file: outdated.NOTICE -license_text_file: outdated.LICENSE -notes: this code was derived and heavily modified from pip/utils/outdated.py. \ No newline at end of file + +license_expression: mit +licenses: + - key: mit + name: MIT License + file: outdated.LICENSE + +notes: this code was derived and heavily modified from pip/utils/outdated.py. diff --git a/tests/packagedcode/data/about/aboutfiles/apipkg.ABOUT b/tests/packagedcode/data/about/aboutfiles/apipkg.ABOUT index 1c5e32ddb3..340f95d665 100644 --- a/tests/packagedcode/data/about/aboutfiles/apipkg.ABOUT +++ b/tests/packagedcode/data/about/aboutfiles/apipkg.ABOUT @@ -3,7 +3,7 @@ download_url: https://pypi.python.org/packages/94/72/fd4f2e46ce7b0d388191c819ef6 version: 1.4 name: apipkg -home_url: https://bitbucket.org/hpk42/apipkg +homepage_url: https://bitbucket.org/hpk42/apipkg owner: Holger Krekel license_expression: mit license_file: apipkg.LICENSE