Skip to content

Commit ba4bbf2

Browse files
authored
Merge pull request #2305 from nexB/release-3
Prepare Release 3.x
2 parents abfe573 + 93ce125 commit ba4bbf2

File tree

5 files changed

+101
-59
lines changed

5 files changed

+101
-59
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.2.1.rc2
2+
current_version = 3.2.3
33
files = setup.py src/scancode_config.py
44
commit = False
55
tag = False

CHANGELOG.rst

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
Changelog
22
=========
33

4+
v3.2.3 (2020-10-27)
5+
-------------------
6+
7+
Notable changes:
8+
9+
- Collect Windows executable metadata #652
10+
- Fix minor bugs
11+
- Add Dockerfile to build docker image from ScanCode sources #2265
12+
413

514
v3.2.2rc3 (2020-09-21)
615
----------------------
716

8-
Internal code changes:
17+
Notable changes:
918

10-
- Ensure commoncode ccan become a standalone package #2233
11-
- Add Dockerfile to build docker image from ScanCode sources #2265
19+
- Use commoncode, typecode and extractcode as external standalone packages #2233
1220

1321

1422
v3.2.1rc2 (2020-09-11)
@@ -94,8 +102,7 @@ v3.2.0rc1 (2020-09-08)
94102
- Improve runtime support for FreeBSD #1695 @knobix
95103
- Update macOS image on azure pipeline @TG1999
96104
- Improve documentation - @Vinay0001
97-
98-
105+
99106

100107
v3.1.1 (2019-09-04)
101108
-------------------

README.rst

Lines changed: 85 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,43 @@ Why use ScanCode?
1212
=================
1313

1414
- As a **standalone command-line tool**, ScanCode is **easy to install**, run,
15-
and embed in your CI/CD processing pipeline. It runs on **Windows, macOS, and Linux**.
16-
17-
- ScanCode is **used by several projects and organizations** such as the `Eclipse
18-
Foundation <https://www.eclipse.org>`_, `OpenEmbedded.org <https://www.openembedded.org>`_,
19-
the `FSF <https://www.fsf.org>`_, `OSS Review Toolkit <http://oss-review-toolkit.org>`_,
15+
and embed in your CI/CD processing pipeline.
16+
It runs on **Windows, macOS, and Linux**.
17+
18+
- ScanCode is **used by several projects and organizations** such as
19+
the `Eclipse Foundation <https://www.eclipse.org>`_,
20+
`OpenEmbedded.org <https://www.openembedded.org>`_,
21+
the `FSFE <https://www.fsfe.org>`_,
22+
the `FSF <https://www.fsf.org>`_,
23+
`OSS Review Toolkit <http://oss-review-toolkit.org>`_,
2024
`ClearlyDefined.io <https://clearlydefined.io/>`_,
21-
`RedHat Fabric8 analytics <https://github.com/fabric8-analytics>`_ and many more.
25+
`RedHat Fabric8 analytics <https://github.com/fabric8-analytics>`_,
26+
and many more.
2227

23-
- ScanCode detects licenses, copyrights, package manifests, and direct dependencies
24-
and more both in **source code** and **binary** files.
28+
- ScanCode detects licenses, copyrights, package manifests, direct
29+
dependencies, and more both in **source code** and **binary** files.
2530

2631
- ScanCode provides the **most accurate license detection engine** and does a
27-
full comparison (also known as diff or red line comparison) between a database of license texts
28-
and your code instead of relying only on regex patterns or probabilistic
29-
search, edit distance, or machine learning.
32+
full comparison (also known as diff or red line comparison) between a database
33+
of license texts and your code instead of relying only on approximate regex
34+
patterns or probabilistic search, edit distance or machine learning.
3035

31-
- Written in Python, ScanCode is **easy to extend with plugins** to contribute new
32-
and improved scanners, data summarization, package manifest parsers, and new
33-
outputs.
36+
- Written in Python, ScanCode is **easy to extend with plugins** to contribute
37+
new and improved scanners, data summarization, package manifest parsers, and
38+
new outputs.
3439

35-
- You can save your scan results as **JSON, HTML, CSV, or SPDX**. And you can use the
40+
- You can save your scan results as **JSON, HTML, CSV or SPDX**. And you can use the
3641
companion `ScanCode workbench GUI app <https://github.com/nexB/scancode-workbench>`_
37-
to review and display scan results, statistics, and graphics.
42+
to review and display scan results, statistics and graphics.
3843

39-
- ScanCode is **actively maintained**, has a **growing community of users**.
44+
- ScanCode is **actively maintained**, has a **growing users and contributors
45+
community**.
4046

41-
- ScanCode is heavily **tested** with an automated test suite of over **8000 tests**.
47+
- ScanCode is heavily **tested** with an automated test suite of over **20,000 tests**.
4248

43-
- ScanCode has extensive and updated Documentation help for users.
49+
See our `roadmap <https://scancode-toolkit.readthedocs.io/en/latest/contribute/roadmap.html>`_
50+
for upcoming features.
4451

45-
See our `roadmap <https://scancode-toolkit.readthedocs.io/en/latest/contribute/roadmap.html>`_ for upcoming features.
4652

4753
Build and tests status
4854
======================
@@ -74,9 +80,16 @@ If you are new to Scancode, start `here <https://scancode-toolkit.readthedocs.io
7480

7581
Other Important Documentation Pages:
7682

77-
- A `Synopsis <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/synopsis.html>`_ of ScanCode Command Line Options
78-
- Tutorials on `How to Run a Scan <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_run_a_scan.html>`_ and `How to Visualize Scan results <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_visualize_scan_results.html>`_
79-
- An exhaustive List of `All Available Options <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/list-options.html>`_
83+
- A `synopsis <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/synopsis.html>`_
84+
of ScanCode command line options.
85+
86+
- Tutorials on:
87+
88+
- `How to run a scan <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_run_a_scan.html>`_
89+
- `How to visualize scan results <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_visualize_scan_results.html>`_
90+
91+
- An exhaustive list of `all available options <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/list-options.html>`_
92+
8093
- Documentation on `Contributing to Code Development <https://scancode-toolkit.readthedocs.io/en/latest/contribute/contrib_dev.html>`_
8194
- Documentation on `Plugin Architecture <https://scancode-toolkit.readthedocs.io/en/latest/plugins/plugin_arch.html>`_
8295
- `FAQ <https://scancode-toolkit.readthedocs.io/en/latest/misc/faq.html>`_
@@ -87,50 +100,71 @@ See also https://aboutcode.org for related companion projects and tools.
87100
Installation
88101
============
89102

90-
Before installing ScanCode make sure you've installed the prerequisites properly. This mainly
91-
refers to installing the required Python interpreter (Python 3.6 is recommended). Refer
92-
`Prerequisites <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#prerequisites>`_ for detailed information on all different platforms and Python Versions.
103+
Before installing ScanCode make sure that you have installed the prerequisites
104+
properly. This means installing Python (Python 3.6 is required in most cases).
105+
See `prerequisites <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#prerequisites>`_
106+
for detailed information on the support platforms and Python versions.
107+
108+
There are a few common ways to `install ScanCode <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html>`_.
109+
110+
- `*Recommended* installation as an application: Download a release archive, extract and run.
111+
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-an-application-downloading-releases>`_
112+
113+
- `Development installation from source code: git clone
114+
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-from-source-code-git-clone>`_
115+
116+
- `Development installation as a library: via pip install scancode-toolkit[full]
117+
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#pip-install>`_
118+
119+
- `Run as a Docker container: git clone and docker run
120+
<https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-via-docker>`_
93121

94-
There are 3 main ways you can `install ScanCode <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html>`_.
95122

96-
- `Installation as an Application: Downloading Releases <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-an-application-downloading-releases>`_ *(Recommended)*
97-
- `Installation via Docker: via pip <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-via-docker>`_
98-
- `Installation from Source Code: Git Clone <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-from-source-code-git-clone>`_
99-
- `Installation as a library: via pip <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#pip-install>`_
100123

101124
Quick Start
102125
===========
103126

104-
Note the `Commands Variation <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#commands-variation>`_ across Installation methods and Platforms.
127+
Note the `commands variation <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#commands-variation>`_
128+
across installation methods and platforms.
105129

106130
You can run an example scan printed on screen as JSON::
107131

108132
./scancode -clip --json-pp - samples
109133

110-
Follow the `How to Run a Scan <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_run_a_scan.html>`_ Tutorial
111-
to perform a basic scan on the ``samples`` directory distributed by default with Scancode.
134+
Follow the `How to Run a Scan <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_run_a_scan.html>`_
135+
tutorial to perform a basic scan on the ``samples`` directory distributed by
136+
default with Scancode.
112137

113138
See more command examples::
114139

115140
./scancode --examples
116141

117-
Refer `How to set what will be detected in Scan <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_set_what_will_be_detected_in_a_scan.html>`_
118-
and `How to specify Scancode Output Format <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_format_scan_output.html>`_ for more information.
142+
See `How to select what will be detected in a scan
143+
<https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_set_what_will_be_detected_in_a_scan.html>`_
144+
and `How to specify the output format <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_format_scan_output.html>`_
145+
for more information.
146+
147+
You can also refer to the `command line options synopsis
148+
<https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/synopsis.html>`_
149+
and an exhaustive list of `all available options
150+
<https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/list-options.html>`_.
119151

120-
You can also refer to `Command Line Options Synopsis <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/synopsis.html>`_ and an exhaustive List of `All Available Options <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/list-options.html>`_.
121152

122153
Archive extraction
123154
==================
124155

125-
The archives that exist in a codebase must be extracted before running a scan:
126-
ScanCode does not extract files from tarballs, zip files, etc. as part of the
127-
scan. The bundled utility `extractcode` is a mostly-universal archive extractor.
128-
For example, this command will recursively extract the mytar.tar.bz2 tarball in
129-
the mytar.tar.bz2-extract directory::
156+
ScanCode does not extract by default files from tarballs, zip files, and
157+
other archives as part of the scan. The archives that exist in a codebase
158+
must be extracted before running a scan: the bundled utility `extractcode`
159+
is a mostly-universal archive extractor. For example, this command will
160+
recursively extract the mytar.tar.bz2 tarball in the mytar.tar.bz2-extract
161+
directory::
130162

131163
./extractcode mytar.tar.bz2
132164

133-
Refer `All Extractcode Options <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/list-options.html#all-extractcode-options>`_ and `How To Extract Archives <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_extract_archives.html>`_ for more information.
165+
See `all extractcode options <https://scancode-toolkit.readthedocs.io/en/latest/cli-reference/list-options.html#all-extractcode-options>`_
166+
and `how to extract archives <https://scancode-toolkit.readthedocs.io/en/latest/tutorials/how_to_extract_archives.html>`_ for details.
167+
134168

135169
Support
136170
=======
@@ -140,21 +174,22 @@ https://github.com/nexB/scancode-toolkit/issues
140174

141175
For discussions and chats, we have:
142176

143-
* an official Gitter channel for web-based chats at https://gitter.im/aboutcode-org/discuss
144-
Gitter is also accessible via an IRC bridge at https://irc.gitter.im/
177+
* an official Gitter channel for `web-based chats
178+
<https://gitter.im/aboutcode-org/discuss>`_.
179+
Gitter is also accessible via an `IRC bridge <https://irc.gitter.im/>`_.
180+
There are other AboutCode project-specific channels available there too.
145181

146182
* an official `#aboutcode` IRC channel on freenode (server chat.freenode.net).
147-
This channel receives build and commit notifications and can be a tad noisy.
148-
You can use your favorite IRC client or use the web chat at
149-
https://webchat.freenode.net/
183+
This channel receives build and commit notifications and can be noisy.
184+
You can use your favorite IRC client or use the `web chat
185+
<https://webchat.freenode.net/>`_.
150186

151-
* a Gitter channel to discuss Documentation at https://gitter.im/aboutcode-org/gsod-season-of-docs
152187

153188
Source code and downloads
154189
=========================
155190

156-
* https://github.com/nexB/scancode-toolkit.git
157191
* https://github.com/nexB/scancode-toolkit/releases
192+
* https://github.com/nexB/scancode-toolkit.git
158193
* https://pypi.org/project/scancode-toolkit/
159194
* https://github.com/nexB/scancode-thirdparty-src.git
160195

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from setuptools import find_packages
1616
from setuptools import setup
1717

18-
version = '3.2.2.rc3'
18+
version = '3.2.3'
1919

2020
#### Small hack to force using a plain version number if the option
2121
#### --plain-version is passed to setup.py

src/scancode_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
2+
# Copyright (c) nexB Inc. and others. All rights reserved.
33
# http://nexb.com and https://github.com/nexB/scancode-toolkit/
44
# The ScanCode software is licensed under the Apache License version 2.0.
55
# Data generated with ScanCode require an acknowledgment.
@@ -97,7 +97,7 @@ def _create_dir(location):
9797
__version__ = get_distribution('scancode-toolkit').version
9898
except DistributionNotFound:
9999
# package is not installed ??
100-
__version__ = '3.2.1.rc2'
100+
__version__ = '3.2.3'
101101

102102
system_temp_dir = tempfile.gettempdir()
103103
scancode_src_dir = dirname(__file__)

0 commit comments

Comments
 (0)