Skip to content

Commit f4c10ed

Browse files
committed
Lint and cleanup documentation
Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent 662963a commit f4c10ed

File tree

10 files changed

+44
-51
lines changed

10 files changed

+44
-51
lines changed

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# -- Project information -----------------------------------------------------
1919

2020
project = 'ScanCode-Toolkit'
21-
copyright = '2019 ScanCode-Toolkit.org'
22-
author = 'ScanCode-Toolkit.org'
21+
copyright = 'nexB Inc. and others.'
22+
author = 'AboutCode.org authors and contributors'
2323

2424

2525
# -- General configuration ---------------------------------------------------

docs/source/contribute/contrib_dev.rst

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TL;DR:
99
- Source code and runtime data are in the /src/ directory.
1010
- Test code and test data are in the /tests/ directory.
1111
- Datasets (inluding licenses) and test data are in /data/ sub-directories.
12-
- We use DCO signoff in commit messages, like Linux does.
12+
- 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

1515
See `CONTRIBUTING.rst <https://github.com/nexB/scancode-toolkit/blob/master/CONTRIBUTING.rst>`_
@@ -45,21 +45,19 @@ new features, we add tests. See existing test code for examples which form also
4545
a good specification for the supported features.
4646

4747
The tests should pass on Linux 64 bits, Windows 64 bits and on
48-
macOS 10.14 and up. We maintain multiple CI loops with Azure (all OSes)
48+
macOS 10.14 and up. We maintain multiple CI loops with Azure (all OSes)
4949
at https://dev.azure.com/nexB/scancode-toolkit/_build and Appveyor (Windows) at
5050
https://ci.appveyor.com/project/nexB/scancode-toolkit .
5151

5252

5353
Several tests are data-driven and use data files as test input and sometimes
5454
data files as test expectation (in this case using either JSON or YAML files);
5555
a large number of copyright, license and package manifest parsing tests are such
56-
data-driven tests.
57-
56+
data-driven tests.
5857

5958

6059
.. _scancode_toolkit_development_running_tests:
6160

62-
6361
Running tests
6462
-------------
6563

@@ -120,7 +118,7 @@ Thirdparty libraries and dependencies management
120118

121119
ScanCode uses the ``configure`` and ``configure.bat`` scripts to install a
122120
`virtualenv <https://virtualenv.pypa.io/en/stable/>`_ , install required
123-
packaged dependencies using `setuptools <https://github.com/pypa/setuptools>`_
121+
packaged dependencies using `setuptools <https://github.com/pypa/setuptools>`_
124122
and such that ScanCode can be installed in a repeatable and consistent manner on
125123
all OSes and Python versions.
126124

@@ -141,16 +139,16 @@ store it in the Git repo in the ``etc/thirdparty`` directory.
141139
We bundle pre-built bundled native binaries as plugins which are installed as
142140
wheels. These binaries are organized by OS and architecture; they ensure that
143141
ScanCode works out of the box either using a checkout or a download, without
144-
needing a compiler and toolchain to be installed.
142+
needing a compiler and toolchain to be installed.
145143

146144
The corresponding source code and build scripts for all for the
147-
pre-built binaries are stored in a separate repository at
145+
pre-built binaries are stored in a separate repository at
148146
https://github.com/nexB/scancode-plugins
149147

150148
ScanCode app archives should not require network access for installation or
151-
configuration of its third-party libraries and dependencies. To enable this,
149+
configuration of its third-party libraries and dependencies. To enable this,
152150
we store bundled thirdparty components and libraries in the ``thirdparty``
153-
directory of released app archives; this is done at build time.
151+
directory of released app archives; this is done at build time.
154152
These dependencies are stored as pre-built wheels. These wheels are sometimes
155153
built by us when there is no wheel available upstream on PyPI. We store all
156154
these prebuilt wheels with corresponding .ABOUT and .LICENSE files in
@@ -159,7 +157,7 @@ for download at https://thirdparty.aboutcode.org/pypi/
159157

160158
Because this is used by the configure script, all the thirdparty dependencies
161159
used in ScanCode MUST be available there first. Therefore adding a new
162-
dependency means requesting a merge/PR in
160+
dependency means requesting a merge/PR in
163161
https://github.com/nexB/thirdparty-packages/ first that contains all the
164162
recursive dependencies.
165163

docs/source/getting-started/home.rst

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,19 @@ is often much harder to accomplish than it should be because:
1919
ScanCode tries to address these issues by offering:
2020

2121
- A simple command line approach that runs on Windows, Linux, and macOS
22-
- A comprehensive code scanner that can detect origin and license information in codebase files, including binaries
23-
- A comprehensive set of package manifests and lockfile parsers to report direct and pinned dependencies
24-
- Your choice of JSON or other output formats (YAML, SPDX, HTML, CSV) for integration with other tools
22+
- A comprehensive code scanner that can detect origin and license information in
23+
codebase files, including binaries
24+
- A comprehensive set of package manifests and lockfile parsers to report direct
25+
and pinned dependencies
26+
- Your choice of JSON or other output formats (YAML, SPDX, HTML, CSV) for
27+
integration with other tools
2528
- Well-tested, easy to hack, and well-documented code
2629
- A plugin system for easily adding new Functionality to Scans.
2730
- Extensive documentation and support.
28-
- We release of the code and reference data under permissive licenses (Apache 2.0 and CC-BY-4.0)
29-
- ScanCode.io to assemble scripted and specialied code analysis pipelines with a web-based analysis server
31+
- We release of the code and reference data under permissive licenses (Apache
32+
2.0 and CC-BY-4.0)
33+
- ScanCode.io to assemble scripted and specialied code analysis pipelines with
34+
a web-based analysis server
3035
- ScanCode workbench for desktop-based scans visualization
3136

3237
ScanCode is recognized as the industry leading engine for license and copyright
@@ -43,7 +48,7 @@ ScanCode detects and normalizes origin, dependencies, licensing and other
4348
related information in your code:
4449

4550
- by parsing package manifests and dependencies lock files to a normalized
46-
metadata model and assigning each an identifying `Package URL
51+
metadata model and assigning each an identifying `Package URL
4752
<https://github.com/package-url/purl-spec>`_,
4853

4954
- by detecting license tags, notices and texts in text and binaries using the

docs/source/getting-started/install.rst

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Comprehensive Installation
22
==========================
33

4-
There are 4 main ways you can install ScanCode.
4+
5+
There are four main ways to install ScanCode.
56

67
- :ref:`app_install`
78

@@ -63,17 +64,22 @@ ScanCode needs a Python 3.6+ interpreter; We support all Python versions from
6364

6465
For Ubuntu, it is ``sudo apt install python3-dev``
6566

66-
- On Ubuntu 14, 16, 18 and 20 run:
67-
``sudo apt install python-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev libpopt0``
67+
- On Ubuntu 14, 16, 18 and 20 run::
68+
69+
sudo apt install python-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev libpopt0
70+
71+
- On Debian and Debian-based distros run::
72+
73+
sudo apt-get install python3-dev libbz2-1.0 xz-utils zlib1g libxml2-dev libxslt1-devlibpopt0
74+
75+
- On RPM-based distros run::
76+
77+
sudo yum install python3.6-devel zlib bzip2-libs xz-libs libxml2-devel libxslt-devellibpopt0
6878

69-
- On Debian and Debian-based distros run:
70-
``sudo apt-get install python3-dev libbz2-1.0 xz-utils zlib1g libxml2-dev libxslt1-devlibpopt0``
79+
- On Fedora 22 and later run::
7180

72-
- On RPM-based distros run:
73-
``sudo yum install python3.6-devel zlib bzip2-libs xz-libs libxml2-devel libxslt-devellibpopt0``
81+
sudo dnf install python3.6-devel xz-libs zlib libxml2-devel libxslt-devel bzip2-libs libpopt0
7482

75-
- On Fedora 22 and later run:
76-
``sudo dnf install python3.6-devel xz-libs zlib libxml2-devel libxslt-devel bzip2-libs libpopt0``
7783

7884
If these packages are not available from your package manager, you must
7985
compile them from sources.
@@ -280,7 +286,7 @@ using the following command::
280286

281287
git checkout develop
282288

283-
Here, ``develop`` branch has the latest release of Scancode-Toolkit.
289+
Here, ``develop`` branch has the latest release of Scancode-Toolkit.
284290
You can also check out to any of the following:
285291

286292
- Branches (Locally created or already present) [Example - ``develop``]
@@ -332,7 +338,7 @@ The steps are:
332338

333339
/usr/bin/python3 -m venv .
334340

335-
For more information on Python virtualenv, visit this
341+
For more information on Python virtualenv, visit this
336342
`page <https://docs.python-guide.org/dev/virtualenvs/#lower-level-virtualenv>`_.
337343

338344
#. Activate the virtual environment you just created::

docs/source/getting-started/newcomer.rst

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ ScanCode Versions
154154
^^^^^^^^^^^^^^^^^
155155

156156
#. You can see all Scancode Toolkit versions on the `GitHub release page <https://github.com/nexB/scancode-toolkit/releases>`_.
157-
#. Refer :ref:`whats_new_this_release` to know more about the latest release.
158-
#. You can also refer the `CHANGELOG <https://github.com/nexB/scancode-toolkit/blob/develop/CHANGELOG.rst>`_ for more information on specific releases.
157+
#. Read the `CHANGELOG <https://github.com/nexB/scancode-toolkit/blob/develop/CHANGELOG.rst>`_ for more information on specific releases.
159158
#. If you want to use/test a specific version of Scancode Toolkit, you can follow the instructions
160159
in :ref:`source_code_install` docs.
161160

@@ -239,12 +238,7 @@ To determine where to contribute, you can refer:
239238
#. ScanCode Toolkit tracks issues via the `GitHub Issue tracker <https://github.com/nexB/scancode-toolkit/issues>`_
240239
#. Broad `milestones <https://github.com/nexB/scancode-toolkit/milestones>`_ for upcoming versions are also maintained.
241240

242-
And documentation related to contributing code can be referred at :ref:`contrib_code_dev`. The main
243-
sections are:
244-
245-
#. :ref:`contrib_code_conven`
246-
#. :ref:`scancode_toolkit_developement_running_tests`
247-
#. :ref:`contrib_dev_pip_and_configure`
241+
And documentation related to contributing code can be referred at :ref:`contrib_code_dev`.
248242

249243
.. _newcomer_good_first_issue:
250244

@@ -332,9 +326,6 @@ Then:
332326

333327
- :ref:`GSoC2019`
334328
- :ref:`GSoD2019`
335-
- :ref:`GSoC2020`
336-
- :ref:`GSoC2021`
337-
- :ref:`GSoD2021`
338329

339330
#. Remain active in Gitter and talk with the organization mentors well ahead of the deadlines.
340331
#. Select projects according to your skills and finalize project proposals.

docs/source/how-to-guides/add_new_license_detection_rule.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ More (advanced) rules options:
5959
- if no license should be detected for your .RULE text, do not add a license expression,
6060
just add a ``notes`` field.
6161

62-
- Each rules needs have one flag such as is_license_notice. See the
62+
- Each rules needs have one flag such as is_license_notice. See the
6363
``src/licensedcode/models.py`` directory for a list of all possible values and
6464
other options.

docs/source/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ Miscellaneous Documents
9494
:maxdepth: 2
9595

9696
misc/index
97-
license
9897

9998

10099
Discussion Documents

docs/source/license.rst

Lines changed: 0 additions & 6 deletions
This file was deleted.

docs/source/misc/faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Can I install ScanCode in a Unicode path?
6868
-----------------------------------------
6969

7070
Yes but but it is best to void this for now. See
71-
https://github.com/nexB/scancode- toolkit/issues/867
71+
https://github.com/nexB/scancode- toolkit/issues/867
7272

7373
There is a bug in virtualenv https://github.com/pypa/virtualenv/issues/457 that
7474
is now fixed but has not been extensively tested for ScanCode.

docs/source/tutorials/how_to_run_a_scan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ by default with Scancode.
88
Prerequisites
99
-------------
1010

11-
Refer to the :ref:`install` installation guide.
11+
Refer to the :ref:'install' installation guide.
1212

1313

1414
Looking into Files

0 commit comments

Comments
 (0)