Skip to content

Commit 26cf993

Browse files
pombredannepombredanne
committed
Merge branch 'develop' of https://github.com/nexB/scancode-toolkit.git into develop
2 parents 74b7278 + 047e383 commit 26cf993

32 files changed

+144
-141
lines changed

‎CHANGELOG.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ v33.0.0 (next next, roadmap)
3434
of these in other summary plugins.
3535
See https://github.com/nexB/scancode-toolkit/issues/1745
3636

37+
- Update link references of ownership from nexB to aboutcode-org
38+
See https://github.com/aboutcode-org/scancode-toolkit/issues/3885
39+
3740

3841
v32.2.1 - 2024-07-02
3942
---------------------
@@ -155,7 +158,7 @@ Changes in Output Data Structure:
155158
file-level ``package_data``
156159
* ``license_detections`` and ``other_license_detections`` in
157160
codebase level ``packages``
158-
161+
159162
- On using the CLI option ``--license-text-diagnostics`` there is
160163
now a new license match attribute ``matched_text_diagnostics``
161164
with the matched text and highlighted diagnostics, instead of
@@ -164,7 +167,7 @@ Changes in Output Data Structure:
164167
- A new ``reference_matches`` attribute is added to codebase-level
165168
``license_detections`` which is same as the ``matches`` attribute
166169
in other license detections.
167-
170+
168171
- We now have SPDX license expressions everywhere we have
169172
ScanCode license expressions for ease of use and adopting
170173
SPDX everywhere. A new attribute ``license_expression_spdx``
@@ -212,7 +215,7 @@ Changes in Output Data Structure:
212215
and https://github.com/nexB/scancode-toolkit/issues/3443
213216
Also improve debian manifests parsing and purl parsing from
214217
filenames. Support for https://github.com/nexB/purldb/issues/245
215-
Bumps debian-inspector to v31.1.0
218+
Bumps debian-inspector to v31.1.0
216219

217220
- Bump commoncode to v31.0.3
218221

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Why use ScanCode?
8989
InstallShield installers, iOS apps, ISO images, Apache IVY, JBoss Sar,
9090
R CRAN, Apache Maven, Meteor, Mozilla extensions, MSI installers,
9191
JavaScript npm packages, package-lock.json, yarn.lock, NSIS Installers,
92-
NugGet, OPam, Cocoapods, Python PyPI setup.py, setup.cfg, and
92+
NuGet, OPam, Cocoapods, Python PyPI setup.py, setup.cfg, and
9393
several related lockfile formats, semi structured README
9494
files such as README.android, README.chromium, README.facebook, README.google,
9595
README.thirdparty, RPMs, Shell Archives, Squashfs images, Java WAR, Windows

‎docs/source/cli-reference/basic-options.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"license_expression": "apache-2.0",
109109
"rule_identifier": "apache-2.0_65.RULE",
110110
"rule_relevance": 100,
111-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
111+
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE",
112112
"matched_text": "License: Apache-2.0"
113113
}
114114
],
@@ -587,19 +587,19 @@
587587

588588
A scan example using the ``--license-url-template TEXT`` option ::
589589

590-
scancode -clpieu --json-pp output.json samples --license-url-template https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/{}.LICENSE
590+
scancode -clpieu --json-pp output.json samples --license-url-template https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/{}.LICENSE
591591

592592
In a normal scan, reference url for "ZLIB License" is as follows::
593593

594594
"reference_url": "https://scancode-licensedb.aboutcode.org/zlib",
595595

596596
After using the option in the following manner::
597597

598-
``--license-url-template https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/{}.LICENSE``
598+
``--license-url-template https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/{}.LICENSE``
599599

600-
the reference URL changes to this `zlib.LICENSE file <https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/zlib.LICENSE>`_::
600+
the reference URL changes to this `zlib.LICENSE file <https://github.com/aboutcode-org/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/zlib.LICENSE>`_::
601601

602-
"reference_url": "https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/zlib.LICENSE",
602+
"reference_url": "https://github.com/aboutcode-org/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/zlib.LICENSE",
603603

604604
The reference URL changes for all detected licenses in the scan, across the scan result file.
605605

@@ -691,7 +691,7 @@
691691
"license_expression": "unknown-license-reference",
692692
"rule_identifier": "lead-in_unknown_30.RULE",
693693
"rule_relevance": 100,
694-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lead-in_unknown_30.RULE",
694+
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lead-in_unknown_30.RULE",
695695
"matched_text": "dual-licensed under [`
696696
},
697697
{
@@ -704,7 +704,7 @@
704704
"license_expression": "wtfpl-2.0",
705705
"rule_identifier": "spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
706706
"rule_relevance": 50,
707-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
707+
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_wtfpl_for_wtfpl-2.0.RULE",
708708
"matched_text": "WTFPL"
709709
},
710710
{
@@ -717,7 +717,7 @@
717717
"license_expression": "wtfpl-2.0",
718718
"rule_identifier": "wtfpl-2.0_27.RULE",
719719
"rule_relevance": 100,
720-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_27.RULE",
720+
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/wtfpl-2.0_27.RULE",
721721
"matched_text": "www.wtfpl.net/"
722722
},
723723
{
@@ -730,7 +730,7 @@
730730
"license_expression": "mit",
731731
"rule_identifier": "mit_64.RULE",
732732
"rule_relevance": 100,
733-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_64.RULE",
733+
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_64.RULE",
734734
"matched_text": "MIT`](https://opensource.org/licenses/MIT)."
735735
}
736736
],

‎docs/source/cli-reference/help-text-options.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The Following Help Text is displayed, i.e. This is the help text for Scancode Ve
7979
--csv FILE [DEPRECATED] Write scan output as CSV to FILE. The
8080
--csv option is deprecated and will be replaced by new
8181
CSV and tabular output formats in the next ScanCode
82-
release. Visit https://github.com/nexB/scancode-
82+
release. Visit https://github.com/aboutcode-org/scancode-
8383
toolkit/issues/3043 to provide inputs and feedback.
8484
--html FILE Write scan output as HTML to FILE.
8585
--custom-output FILE Write scan output to FILE formatted with the custom
@@ -321,7 +321,7 @@ The Following Text is displayed, i.e. This is the available plugins for Scancode
321321
required_plugins:
322322
options:
323323
help_group: output formats, name: csv: --csv
324-
help: [DEPRECATED] Write scan output as CSV to FILE. The --csv option is deprecated and will be replaced by new CSV and tabular output formats in the next ScanCode release. Visit https://github.com/nexB/scancode-toolkit/issues/3043 to provide inputs and feedback.
324+
help: [DEPRECATED] Write scan output as CSV to FILE. The --csv option is deprecated and will be replaced by new CSV and tabular output formats in the next ScanCode release. Visit https://github.com/aboutcode-org/scancode-toolkit/issues/3043 to provide inputs and feedback.
325325
doc: None
326326

327327
--------------------------------------------

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ following options.
5858
"--package": true,
5959
"--url": true
6060
},
61-
"notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
61+
"notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.",
6262
"start_timestamp": "2019-10-19T191117.292858",
6363
"end_timestamp": "2019-10-19T191219.743133",
6464
"message": null,
@@ -221,7 +221,7 @@ following options.
221221

222222
The whole Output file looks like::
223223

224-
{"headers":[{"tool_name":"scancode-toolkit","tool_version":"3.1.1","options":{"input":["samples/"],"--copyright":true,"--email":true,"--info":true,"--json-lines":"output.json","--license":true,"--package":true,"--url":true},"notice":"Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.","start_timestamp":"2019-10-19T210920.143831","end_timestamp":"2019-10-19T211052.048182","message":null,"errors":[],"extra_data":{"files_count":36}}]}
224+
{"headers":[{"tool_name":"scancode-toolkit","tool_version":"3.1.1","options":{"input":["samples/"],"--copyright":true,"--email":true,"--info":true,"--json-lines":"output.json","--license":true,"--package":true,"--url":true},"notice":"Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.","start_timestamp":"2019-10-19T210920.143831","end_timestamp":"2019-10-19T211052.048182","message":null,"errors":[],"extra_data":{"files_count":36}}]}
225225
{"files":[{"path":"samples" ... "scan_errors":[]}]}
226226
{"files":[{"path":"samples/README", ... "scan_errors":[]}]}
227227
{"files":[{"path":"samples/screenshot.png", ... "scan_errors":[]}]}
@@ -340,7 +340,7 @@ Comparing Different ``json`` Output Formats
340340
ScanCode should be considered or used as legal advice. Consult an Attorney
341341
for any legal advice.
342342
ScanCode is a free software code scanning tool from nexB Inc. and others.
343-
Visit https://github.com/nexB/scancode-toolkit/ for support and download.</text>
343+
Visit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.</text>
344344

345345

346346
# Creation Info
@@ -459,7 +459,7 @@ Comparing Different ``json`` Output Formats
459459

460460
This option is deprecated and will be replaced by new CSV and tabular
461461
output formats in the next ScanCode release. Visit
462-
https://github.com/nexB/scancode-toolkit/issues/3043
462+
https://github.com/aboutcode-org/scancode-toolkit/issues/3043
463463
for details and to provide inputs and feedback.
464464

465465
The following code performs a scan on the samples directory, and publishes the results in

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ To see all plugins available via command line help, use ``--plugins``.
409409
"ignorable_urls": [],
410410
"ignorable_emails": [],
411411
"text": "Permission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
412-
"scancode_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
412+
"scancode_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/mit.LICENSE",
413413
"licensedb_url": "https://scancode-licensedb.aboutcode.org/mit",
414414
"spdx_url": "https://spdx.org/licenses/MIT"
415415
}
@@ -419,7 +419,7 @@ To see all plugins available via command line help, use ``--plugins``.
419419
"license_expression": "mit",
420420
"identifier": "mit_30.RULE",
421421
"language": "en",
422-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
422+
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
423423
"is_license_text": false,
424424
"is_license_notice": false,
425425
"is_license_reference": false,
@@ -462,7 +462,7 @@ To see all plugins available via command line help, use ``--plugins``.
462462
"license_expression": "mit",
463463
"rule_identifier": "mit_30.RULE",
464464
"rule_relevance": 100,
465-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
465+
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_30.RULE",
466466
"matched_text": "License: mit"
467467
}
468468
],

‎docs/source/cli-reference/synopsis.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ A sample JSON output file structure will look like::
127127
"--package": true,
128128
"--url": true
129129
},
130-
"notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
130+
"notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/scancode-toolkit/ for support and download.",
131131
"start_timestamp": "2019-10-19T191117.292858",
132132
"end_timestamp": "2019-10-19T191219.743133",
133133
"message": null,

‎docs/source/contribute/contrib_dev.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TL;DR:
1212
- We use DCO signoff in commit messages, like Linux does.
1313
- Porting ScanCode to other OS (FreeBSD is supported, etc.) is possible. Enter an issue for help.
1414

15-
See `CONTRIBUTING.rst <https://github.com/nexB/scancode-toolkit/blob/develop/CONTRIBUTING.rst>`_
15+
See `CONTRIBUTING.rst <https://github.com/aboutcode-org/scancode-toolkit/blob/develop/CONTRIBUTING.rst>`_
1616
for details.
1717

1818

@@ -82,7 +82,7 @@ If you have a multiprocessor machine you might want to run the tests in parallel
8282
typically run the tests in verbose mode with ``pytest -vvs -n4``.
8383

8484
You can also run a subset of the test suite as shown in the CI configs
85-
https://github.com/nexB/scancode-toolkit/blob/develop/azure-pipelines.yml e,g,
85+
https://github.com/aboutcode-org/scancode-toolkit/blob/develop/azure-pipelines.yml e,g,
8686
``pytest -n 2 -vvs tests/scancode`` runs only the test scripts present in the
8787
``tests/scancode`` directory. (You can give the path to a specific test script
8888
file there too).
@@ -166,7 +166,7 @@ needing a compiler and toolchain to be installed.
166166

167167
The corresponding source code and build scripts for all for the
168168
pre-built binaries are stored in a separate repository at
169-
https://github.com/nexB/scancode-plugins
169+
https://github.com/aboutcode-org/scancode-plugins
170170

171171
ScanCode app archives should not require network access for installation or
172172
configuration of its third-party libraries and dependencies. To enable this,

‎docs/source/contribute/contrib_doc.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To get started, create or identify a working directory on your local machine.
1212

1313
Open that directory and execute the following command in a terminal session::
1414

15-
git clone https://github.com/nexB/scancode-toolkit.git
15+
git clone https://github.com/aboutcode-org/scancode-toolkit.git
1616

1717
That will create an ``/scancode-toolkit`` directory in your working directory.
1818
Now you can install the dependencies in a virtualenv::
@@ -324,9 +324,9 @@ Automatic Docs Generation
324324

325325
It's possible to generate docs automatically from data by using a combination of:
326326

327-
- `shell scripts: example <https://github.com/nexB/scancode-toolkit/blob/develop/docs/scripts/regen_package_docs.sh>`_
328-
- `python scripts: example <https://github.com/nexB/scancode-toolkit/blob/develop/src/packagedcode/regen_package_docs.py>`_
329-
- `jinja templates: example <https://github.com/nexB/scancode-toolkit/blob/develop/src/packagedcode/templates/available_package_parsers.rst>`_
327+
- `shell scripts: example <https://github.com/aboutcode-org/scancode-toolkit/blob/develop/docs/scripts/regen_package_docs.sh>`_
328+
- `python scripts: example <https://github.com/aboutcode-org/scancode-toolkit/blob/develop/src/packagedcode/regen_package_docs.py>`_
329+
- `jinja templates: example <https://github.com/aboutcode-org/scancode-toolkit/blob/develop/src/packagedcode/templates/available_package_parsers.rst>`_
330330

331331
And we do this currently to keep a documentation page for all the supported package formats.
332332
See :ref:`supported_packages` for details.

‎docs/source/contribute/cut_new_release.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Tag and publish
4141
Automated Release Process
4242
-------------------------
4343

44-
- We have an `automated release script <https://github.com/nexB/scancode-toolkit/actions/workflows/scancode-release.yml>`_
44+
- We have an `automated release script <https://github.com/aboutcode-org/scancode-toolkit/actions/workflows/scancode-release.yml>`_
4545
triggered by a pushed tag, where jobs run to:
4646

4747
- Build pypi wheels and sdist archives

0 commit comments

Comments
 (0)