Skip to content

Commit 3b51763

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into add_new_flag
2 parents b83ec88 + 030f398 commit 3b51763

File tree

1,466 files changed

+193707
-8103
lines changed

Some content is hidden

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

1,466 files changed

+193707
-8103
lines changed

CHANGELOG.rst

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ Changelog
44
v21.x.x (next, future)
55
-----------------------
66

7-
Breaking API changes:
8-
~~~~~~~~~~~~~~~~~~~~~
7+
Important API changes:
8+
~~~~~~~~~~~~~~~~~~~~~~~~
9+
10+
- The data structure of the JSON output is now versioned and the next version
11+
is available with a new command line option. We are also documenting a new
12+
and clear API policy and backward compatibility policy.
913

1014
- The data structure of the JSON output has changed for copyrights, authors
1115
and holders: we now use proper name for attributes and not a generic "value".
@@ -24,35 +28,97 @@ Breaking API changes:
2428
multiple manifests for a single package instance.
2529

2630

31+
Copyright detection:
32+
~~~~~~~~~~~~~~~~~~~~
33+
34+
- The data structure in the JSON is now using consistently named attributes as
35+
opposed to a plain value.
36+
37+
38+
Package detection:
39+
~~~~~~~~~~~~~~~~~~
40+
41+
- Add support for OpenWRT packages.
42+
- Add support for Yocto/BitBake .bb recipes.
43+
- Add support to track installed files for each Package type.
44+
45+
46+
v21.8.4
47+
---------
48+
49+
This is a minor bug fix release primarily for Windows installation.
50+
There is no feature change.
51+
52+
Installation:
53+
~~~~~~~~~~~~~~~~~~
54+
55+
- Application installation on Windows works again. This fixes #2610
56+
- We now build and test app bundles on all supported Python versions: 3.6 to 3.9
57+
58+
59+
Thank you to @gunaztar for reporting the #2610 bug
60+
61+
Documentation:
62+
~~~~~~~~~~~~~~~~~~
63+
64+
- Documentation is updated to reference supported Python versions 3.6 to 3.9
65+
66+
67+
68+
v21.7.30
69+
---------
70+
71+
This is a minor release with several bug fixes, major performance improvements
72+
and support for new and improved package formats
73+
74+
75+
Many thanks to every contributors that made this possible and in particular:
76+
77+
- Abhigya Verma @abhi27-web
78+
- Ayan Sinha Mahapatra @AyanSinhaMahapatra
79+
- Dennis Clark @DennisClark
80+
- Jono Yang @JonoYang
81+
- Mayur Agarwal @mrmayurgithub
82+
- Philippe Ombredanne @pombredanne
83+
- Pierre Tardy @tardyp
84+
85+
2786
Outputs:
2887
~~~~~~~~
2988

3089
- Add new YAML-formatted output. This is exactly the same data structure as for
3190
the JSON output
3291
- Add new Debian machine readable copyright output.
3392
- The CSV output "Resource" column has been renamed to "path".
34-
- The SPDX output now has the mandatory DocumentNamespace attribut per SPDX specs #2344
93+
- The SPDX output now has the mandatory DocumentNamespace attribute per SPDX specs #2344
3594

3695

3796
Copyright detection:
3897
~~~~~~~~~~~~~~~~~~~~
3998

40-
- The data structure in the JSON is now using consistently named attributes as
41-
opposed to a plain value.
42-
4399
- The copyright detection speed has been significantly improved with the tests
44100
taking roughly 1/2 of the time to run. This is achieved mostly by replacing
45101
NLTK with a the minimal and simplified subset we need in a new library named
46102
pygmars.
47103

104+
License detection:
105+
~~~~~~~~~~~~~~~~~~~
106+
107+
- Add new licenses: now tracking 1763 licenses
108+
- Add new license detection rules: now tracking 29475 license detection rules
109+
- We have also improved license expression parsing and processing
110+
48111

49112
Package detection:
50113
~~~~~~~~~~~~~~~~~~
51114

52-
- Add support for OpenWRT packages.
53-
- Add support for Yocto/BitBake .bb recipes.
115+
- The Debian packages declared license detection has been significantly improved.
54116
- The Alpine packages declared license detection has been significantly improved.
55-
- Add support to track installed files for each Package type.
117+
- There is new support for shell parsing and Alpine packages APKBUILD data collection.
118+
- There is new support for various Windows packages detection using multiple
119+
techniques including MSI, Windows registry and several more.
120+
- There is new support for Distroless Debian-like installed packages.
121+
- There is new support for Dart Pub package manifests.
56122

57123

58124
v21.6.7

INSTALL.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@ Prerequisites
1616
-------------
1717

1818
Before installing ScanCode make sure you have installed these prerequisites.
19-
The main one is a Python interpreter.
20-
Python 3.6 is required for the standard installation.
19+
The main one is to have Python installed version 3.6, 3.7, 3.8 or 3.9.
2120

2221
- For Linux(Ubuntu): ``sudo apt install python3.6-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev``
23-
- For MacOS: Install Python 3.6.8 from https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg
24-
- For Windows: Install Python 3.6.8 from https://www.python.org/ftp/python/3.6.8/python-3.6.8-amd64.exe
25-
- For FreeBSD: (this ineeds to be documented)
22+
- For MacOS: Install Python 3.x from https://www.python.org/
23+
- For Windows: Install Python 3.x from https://www.python.org/ using the 64 bits amd64 variant
24+
- For FreeBSD: (this needs to be documented)
2625

2726
Refer `Prerequisites <https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#prerequisites>`_
2827
for detailed information on all different operating systems and Python versions.
@@ -46,9 +45,9 @@ Use a release download and install as an application
4645
Advanced installation: pip install a Python PyPI package
4746
--------------------------------------------------------
4847

49-
- Create a virtual environment for Python 3.6 (of higher) and activate it::
48+
- Create a virtual environment for Python 3.x and activate it::
5049

51-
virtualenv -p /usr/bin/python3.6 venv-scancode && source venv-scancode/bin/activate
50+
virtualenv -p python3 venv-scancode && source venv-scancode/bin/activate
5251

5352
- Run ``pip install scancode-toolkit[full]``
5453

README.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ Installation
120120
============
121121

122122
Before installing ScanCode make sure that you have installed the prerequisites
123-
properly. This means installing Python (Python 3.6 or higher is required.
124-
When installing the app tarball or zip, only Python 3.6 is supported for now).
123+
properly. This means installing Python (Python 3.6 or higher is required).
125124

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

configure

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ CLEANABLE="
4545
.eggs
4646
pip-selfcheck.json
4747
src/scancode_toolkit.egg-info
48+
src/scancode_toolkit_mini.egg-info
4849
SCANCODE_DEV_MODE
4950
man
5051
Scripts"
5152

53+
5254
# extra arguments passed to pip
5355
PIP_EXTRA_ARGS=" "
5456

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ following options.
2929
others. Scancode Workbench and other applications that use Scancode Result data as input accept
3030
only the ``json`` format.
3131

32-
.. include:: /rst_snippets/note_snippets/output_json_notdef.rst
33-
3432
The following code performs a scan on the samples directory, and publishes the results in
3533
``json`` format::
3634

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 ---------------------------------------------------

0 commit comments

Comments
 (0)