Skip to content

Commit 9939e13

Browse files
Merge pull request #3292 from nexB/doc-update-licenses
Update documentation for v32
2 parents 827122d + 9070f0f commit 9939e13

File tree

63 files changed

+3232
-2893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3232
-2893
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ Make sure these boxes are checked before your pull request (PR) is ready to be r
1717
* [ ] Tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
1818
Run [tests](https://scancode-toolkit.readthedocs.io/en/latest/contribute/contrib_dev.html#running-tests) locally to check for errors.
1919
* [ ] Commits are in uniquely-named feature branch and has no merge conflicts 📁
20-
20+
* [ ] Looked for possible updates in documentation and added updates if applicable
21+
* [ ] Updated CHANGELOG.rst
2122
<!--
2223
We're happy to help you get this ready -- don't be afraid to ask for help, and **don't be discouraged**
2324
if your tests fail at first!

README.rst

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Check out the code at https://github.com/nexB/scancode-toolkit
1313
Discover also:
1414

1515
- The ScanCode.io server project here: https://scancodeio.readthedocs.io
16+
- The ScanCode Workbench project for visualization of scancode results data:
17+
https://github.com/nexB/scancode-workbench
1618
- Other companion SCA projects for code origin, license and security analysis
1719
here: https://aboutcode.org
1820

@@ -23,11 +25,11 @@ Build and tests status
2325
We run 30,000+ tests on each commit on multiple CIs to ensure a good platform
2426
compabitility with multiple versions of Windows, Linux and macOS.
2527

26-
+--------------+--------------+--------------+
27-
| **Appveyor** | **Azure** | **RTD Build**|
28-
+==============+==============+==============+
29-
| |appveyor| | |azure| | |docs-rtd| |
30-
+--------------+--------------+--------------+
28+
+------------+--------------+-------------------------+----------------------------+
29+
| **Azure** | **RTD Build**| **GitHub actions Docs** | **GitHub actions Release** |
30+
+============+==============+=========================+============================+
31+
| |azure| | |docs-rtd| | |docs-github-actions| | |release-github-actions| |
32+
+------------+--------------+-------------------------+----------------------------+
3133

3234

3335
Why use ScanCode?
@@ -61,35 +63,39 @@ Why use ScanCode?
6163
new and improved scanners, data summarization, package manifest parsers, and
6264
new outputs.
6365

64-
- You can save your scan results as **JSON, HTML, CSV or SPDX** or create your
65-
own format with Jinja templates.
66+
- You can save your scan results as **JSON, YAML, HTML, CycloneDX or SPDX** or
67+
even create your own format with Jinja templates.
6668

6769
- You can also organize and run ScanCode server-side with the
6870
companion `ScanCode.io web app <https://github.com/nexB/scancode.io>`_
6971
to organize and store multiple scan projects including scripted scanning pipelines.
7072

73+
- ScanCode output data can be easily visualized and analysed using the
74+
`ScanCode Workbench <https://github.com/nexB/scancode-workbench>`_ desktop app.
75+
7176
- ScanCode is **actively maintained**, has a **growing users and contributors
7277
community**.
7378

7479
- ScanCode is heavily **tested** with an automated test suite of over **20,000 tests**.
7580

7681
- ScanCode has an extensive and growing documentation.
7782

78-
- ScanCode can process these packages, build manifest and lockfile formats to collect Package URLs and
79-
extract metadata: Alpine packages, BUCK files, ABOUT files, Android apps, Autotools, Bazel,
80-
JavaScript Bower, Java Axis, MS Cab, Rust Cargo, Cocoapods, Chef Chrome apps,
81-
PHP Composer and composer.lock, Conda, CPAN, Debian, Apple dmg,
82-
Java EAR, WAR, JAR, FreeBSD packages, Rubygems gemspec, Gemfile and Gemfile.lock,
83-
Go modules, Haxe packages, InstallShield installers, iOS apps, ISO images,
84-
Apache IVY, JBoss Sar, R CRAN, Apache Maven, Meteor, Mozilla extensions,
85-
MSI installers, JavaScript npm packages, package-lock.json, yarn.lock,
86-
NSIS Installers, NugGet, OPam, Cocoapods, Python PyPI setup.py, setup.cfg, and
83+
- ScanCode can process packages, build manifest and lockfile formats to collect
84+
Package URLs and extract metadata: Alpine packages, BUCK files, ABOUT files,
85+
Android apps, Autotools, Bazel, JavaScript Bower, Java Axis, MS Cab,
86+
Rust Cargo, Cocoapods, Chef Chrome apps, PHP Composer and composer.lock,
87+
Conda, CPAN, Debian, Apple dmg, Java EAR, WAR, JAR, FreeBSD packages,
88+
Rubygems gemspec, Gemfile and Gemfile.lock, Go modules, Haxe packages,
89+
InstallShield installers, iOS apps, ISO images, Apache IVY, JBoss Sar,
90+
R CRAN, Apache Maven, Meteor, Mozilla extensions, MSI installers,
91+
JavaScript npm packages, package-lock.json, yarn.lock, NSIS Installers,
92+
NugGet, OPam, Cocoapods, Python PyPI setup.py, setup.cfg, and
8793
several related lockfile formats, semi structured README
8894
files such as README.android, README.chromium, README.facebook, README.google,
8995
README.thirdparty, RPMs, Shell Archives, Squashfs images, Java WAR, Windows
9096
executables and the Windows registry
91-
and a few more.
92-
97+
and a few more. See `all available package parsers <https://scancode-toolkit.readthedocs.io/en/stable/reference/available_package_parsers.html>`_
98+
for the exhaustive list.
9399

94100
See our `roadmap <https://scancode-toolkit.readthedocs.io/en/latest/contribute/roadmap.html>`_
95101
for upcoming features.
@@ -101,11 +107,11 @@ Documentation
101107
The ScanCode documentation is hosted at
102108
`scancode-toolkit.readthedocs.io <https://scancode-toolkit.readthedocs.io/en/latest/>`_.
103109

104-
If you are new to Scancode, start with our
110+
If you are new to visualization of scancode results data, start with our
105111
`newcomer <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/newcomer.html>`_ page.
106112

107-
If you want to compare output changes between different versions of Scancode,
108-
or want to look at scans generated by Scancode, review our
113+
If you want to compare output changes between different versions of ScanCode,
114+
or want to look at scans generated by ScanCode, review our
109115
`reference scans <https://github.com/nexB/scancode-toolkit-reference-scans>`_.
110116

111117
Other Important Documentation Pages:
@@ -134,21 +140,23 @@ Installation
134140

135141
Before installing ScanCode make sure that you have installed the prerequisites
136142
properly. This means installing Python 3.8 for x86/64 architectures.
137-
We support Python 3.8, 3.9 and 3.10.
143+
We support Python 3.8, 3.9, 3.10 and 3.11.
138144

139145
See `prerequisites <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#prerequisites>`_
140146
for detailed information on the support platforms and Python versions.
141147

142148
There are a few common ways to `install ScanCode <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html>`_.
143149

144-
- **Installation as an application: Install Python 3.8, download a release archive, extract and run**. `This is the recommended installation method.
150+
- `**Installation as an application: Install Python 3.8, download a release archive, extract and run**.
145151
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-an-application-downloading-releases>`_
152+
This is the recommended installation method.
146153

147154
- `Development installation from source code using a git clone
148155
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-from-source-code-git-clone>`_
149156

150157
- `Development installation as a library with "pip install scancode-toolkit"
151158
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#pip-install>`_
159+
[Note that this is not supported on arm64 machines]
152160

153161
- `Run in a Docker container with a git clone and "docker run"
154162
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-via-docker>`_
@@ -157,20 +165,17 @@ There are a few common ways to `install ScanCode <https://scancode-toolkit.readt
157165
Quick Start
158166
===========
159167

160-
Note the `commands variation <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#commands-variation>`_
161-
across installation methods and platforms.
168+
After ScanCode is installed successfully you can run an example scan printed on screen as JSON::
162169

163-
You can run an example scan printed on screen as JSON::
164-
165-
./scancode -clip --json-pp - samples
170+
scancode -clip --json-pp - samples
166171

167172
Follow the `How to Run a Scan <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_run_a_scan.html>`_
168173
tutorial to perform a basic scan on the ``samples`` directory distributed by
169-
default with Scancode.
174+
default with ScanCode.
170175

171176
See more command examples::
172177

173-
./scancode --examples
178+
scancode --examples
174179

175180
See `How to select what will be detected in a scan
176181
<https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_set_what_will_be_detected_in_a_scan.html>`_
@@ -208,15 +213,13 @@ https://github.com/nexB/scancode-toolkit/issues
208213
For discussions and chats, we have:
209214

210215
* an official Gitter channel for `web-based chats
211-
<https://gitter.im/aboutcode-org/discuss>`_.
212-
Gitter is also accessible via an `IRC bridge <https://irc.gitter.im/>`_.
216+
<https://matrix.to/#/#aboutcode-org_discuss:gitter.im>`_.
217+
Gitter is now accessible through `Element <https://element.io/download>`_
218+
or an `IRC bridge <https://matrix-org.github.io/matrix-appservice-irc/latest/usage.html>`_.
213219
There are other AboutCode project-specific channels available there too.
214220

215-
* an official `#aboutcode` IRC channel on liberachat (server web.libera.chat).
216-
This channel receives build and commit notifications and can be noisy.
217-
You can use your favorite IRC client or use the `web chat
218-
<https://web.libera.chat/?#aboutcode>`_.
219-
221+
* The discussion channel for `scancode <https://matrix.to/#/#aboutcode-org_scancode:gitter.im>`_
222+
specifically aimed at users and developers using scancode-toolkit.
220223

221224
Source code and downloads
222225
=========================
@@ -225,7 +228,8 @@ Source code and downloads
225228
* https://github.com/nexB/scancode-toolkit.git
226229
* https://pypi.org/project/scancode-toolkit/
227230
* https://github.com/nexB/scancode-thirdparty-src.git
228-
231+
* https://github.com/nexB/scancode-plugins.git
232+
* https://github.com/nexB/thirdparty-packages.git
229233

230234
License
231235
=======
@@ -240,14 +244,18 @@ See the NOTICE file and the .ABOUT files that document the origin and license of
240244
the third-party code used in ScanCode for more details.
241245

242246

243-
.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/4webymu0l2ip8utr?svg=true
244-
:target: https://travis-ci.org/nexB/scancode-toolkit
245-
:alt: Appveyor tests status (Windows)
246-
247247
.. |azure| image:: https://dev.azure.com/nexB/scancode-toolkit/_apis/build/status/nexB.scancode-toolkit?branchName=develop
248248
:target: https://dev.azure.com/nexB/scancode-toolkit/_build/latest?definitionId=1&branchName=develop
249249
:alt: Azure tests status (Linux, macOS, Windows)
250250

251251
.. |docs-rtd| image:: https://readthedocs.org/projects/scancode-toolkit/badge/?version=latest
252252
:target: https://scancode-toolkit.readthedocs.io/en/latest/?badge=latest
253253
:alt: Documentation Status
254+
255+
.. |docs-github-actions| image:: https://github.com/nexB/scancode-toolkit/actions/workflows/docs-ci.yml/badge.svg?branch=develop
256+
:target: https://github.com/nexB/scancode-toolkit/actions/workflows/docs-ci.yml
257+
:alt: Documentation Tests
258+
259+
.. |release-github-actions| image:: https://github.com/nexB/scancode-toolkit/actions/workflows/scancode-release.yml/badge.svg?event=push
260+
:target: https://github.com/nexB/scancode-toolkit/actions/workflows/scancode-release.yml
261+
:alt: Release tests

docs/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ help:
1818
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1919
%: Makefile
2020
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
21+
./scripts/regen_package_docs.sh

docs/scripts/regen_package_docs.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
# halt script on error
3+
set -e
4+
5+
# Path to the available packages doc
6+
DOC_PATH="source/reference/available_package_parsers.rst"
7+
8+
# Regen docs for available package parsers
9+
regen-package-docs --path "$DOC_PATH"
10+
11+
# Delete whitespace from last line to not fail doc8 tests
12+
sed -i '$ d' "$DOC_PATH"

0 commit comments

Comments
 (0)