Skip to content

Commit f3ef5b4

Browse files
pombredannepombredanne
authored
Merge pull request #2365 from nexB/release-21-01-prep
Release 21.1.21 Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2 parents 66f5916 + f9a916d commit f3ef5b4

18,744 files changed

Lines changed: 157420 additions & 84262 deletions

File tree

Some content is hidden

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

‎.bumpversion.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[bumpversion]
2-
current_version = 3.2.3
3-
files = setup.py src/scancode_config.py
2+
current_version = 21.01.02
3+
files = setup.cfg src/scancode_config.py
44
commit = False
55
tag = False
66

‎.cirrus.yml‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,20 @@
11
env:
2-
CIRRUS_CLONE_DEPTH: 1
3-
ARCH: amd64
4-
5-
py27_task:
6-
env:
7-
PYTHON_EXE: /usr/local/bin/python2.7
8-
9-
freebsd_instance:
10-
matrix:
11-
image: freebsd-11-2-release-amd64
12-
image: freebsd-12-0-release-amd64
13-
14-
install_script:
15-
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
16-
- pkg upgrade -y
17-
- pkg install -y python27 bash libxml2 libxslt
18-
script:
19-
- ./configure
2+
CIRRUS_CLONE_DEPTH: 1
3+
ARCH: amd64
204

215
py36_task:
22-
env:
23-
PYTHON_EXE: /usr/local/bin/python3.6
6+
env:
7+
PYTHON_EXE: /usr/local/bin/python3.6
8+
9+
freebsd_instance:
10+
matrix:
11+
image: freebsd-11-2-release-amd64
12+
image: freebsd-12-0-release-amd64
2413

25-
freebsd_instance:
26-
matrix:
27-
image: freebsd-11-2-release-amd64
28-
image: freebsd-12-0-release-amd64
14+
install_script:
15+
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
16+
- pkg upgrade -y
17+
- pkg install -y python36 bash libxml2 libxslt
2918

30-
install_script:
31-
- sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
32-
- pkg upgrade -y
33-
- pkg install -y python36 bash libxml2 libxslt
34-
script:
35-
- ./configure
19+
script:
20+
- ./configure

‎.gitattributes‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# never convert crlf
2-
* binary
1+
# Ignore all Git auto CR/LF line endings conversions
2+
* binary

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# Python compiled files
55
*.py[cod]
66

7+
# do not commit thriparty cache of wheels
8+
/thirdparty
9+
710
# virtualenv and other misc bits
811
*.egg-info
912
/dist
@@ -81,3 +84,4 @@ tcl
8184
/.env
8285

8386
*.orig
87+
/release*

‎.travis.yml‎

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

‎CHANGELOG.rst‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,56 @@
11
Changelog
22
=========
3-
vNext
4-
-----
5-
- Updated scancode.bat to handle % signs in the arguments #1876
63

7-
v20.11 (next)
8-
-------------
4+
v21.x (next)
5+
------------
96

10-
Notable changes:
117

12-
- support officially Python 64 bits on Windows 64 bits #335
13-
8+
9+
v21.1.21
10+
--------
11+
12+
Operating system support:
13+
14+
- Drop support for Python 2 #295
15+
- Drop support for 32 bits on Windows #335
16+
- Add support for Python 64 bits on Windows 64 bits #335
17+
- Add support for Python 3.6 to Python 3.9 on Linux, Windows and macOS.
18+
These are now tested on Azure.
19+
- Add deprecation message for native Windows support #2366
20+
21+
License scanning:
22+
23+
- Improve license detection accuracy with over 8400 new license detection fules
24+
added or updated
25+
- Remove the previously deprecated --license-diag option
26+
- Include pre-built license index in release archives to speed up start #988
27+
- Use SPDX LicenseRef-scancode namespace for all licenses keys not in SPDX
28+
- Replace DEJACODE_LICENSE_URL with SCANCODE_LICENSEDB_URL at
29+
https://scancode-licensedb.aboutcode.org #2165
30+
31+
Package scanning:
32+
33+
- Add detection of package-installed files
34+
- Add analysis of system package installed databases for Debian, OpenWRT and
35+
Alpine Linux packages
36+
- Add support for Alpine Linux, Debian, OpenWRT.
37+
38+
Copyright scanning:
39+
40+
- Improve detection with minor grammar fixes
41+
42+
Misc.
43+
44+
- Adopt a new calendar date-based versioning for scancode-toolkit version numbers
45+
- Update thirdparty dependencies and built-in plugins
46+
- Allow installation without extractcode and typecode native plugins. Instead
47+
one can elect to install these or not to have a lighter footprint if needed.
48+
- Update configuration and bootstrap scripts to support a new PyPI-like
49+
repository at https://thirdparty.aboutcode.org/pypi/
50+
- Create new release scripts to populate released archives with just the
51+
required wheels of a given OS and Python version.
52+
- Updated scancode.bat to handle % signs in the arguments #1876
53+
1454

1555

1656
v3.2.3 (2020-10-27)

‎Dockerfile‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
#
2-
# Copyright (c) 2018 nexB Inc. and others. All rights reserved.
3-
# http://nexb.com and https://github.com/nexB/scancode-toolkit/
2+
# Copyright (c) nexB Inc. and others. All rights reserved.
3+
# SPDX-License-Identifier: Apache-2.0 AND CC-BY-4.0
4+
#
5+
# Visit https://aboutcode.org and https://github.com/nexB/scancode-toolkit for
6+
# support and download. ScanCode is a trademark of nexB Inc.
7+
#
48
# The ScanCode software is licensed under the Apache License version 2.0.
5-
# Data generated with ScanCode require an acknowledgment.
6-
# ScanCode is a trademark of nexB Inc.
9+
# The ScanCode open data is licensed under CC-BY-4.0.
10+
#
11+
# Licensed under the Apache License, Version 2.0 (the "License");
12+
# you may not use this file except in compliance with the License.
13+
# You may obtain a copy of the License at
714
#
8-
# You may not use this software except in compliance with the License.
9-
# You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
10-
# Unless required by applicable law or agreed to in writing, software distributed
11-
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
12-
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
13-
# specific language governing permissions and limitations under the License.
15+
# http://www.apache.org/licenses/LICENSE-2.0
1416
#
15-
# When you publish or redistribute any data created with ScanCode or any ScanCode
16-
# derivative work, you must accompany this data with the following acknowledgment:
17+
# Unless required by applicable law or agreed to in writing, software
18+
# distributed under the License is distributed on an "AS IS" BASIS,
19+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
20+
# See the License for the specific language governing permissions and
21+
# limitations under the License.
1722
#
18-
# Generated with ScanCode and provided on an "AS IS" BASIS, WITHOUT WARRANTIES
19-
# OR CONDITIONS OF ANY KIND, either express or implied. No content created from
20-
# ScanCode should be considered or used as legal advice. Consult an Attorney
21-
# for any legal advice.
22-
# ScanCode is a free software code scanning tool from nexB Inc. and others.
23-
# Visit https://github.com/nexB/scancode-toolkit/ for support and download.
2423

2524
FROM python:3.6
2625

‎MANIFEST.in‎

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,18 @@
1-
graft etc
21
graft src
32
graft thirdparty
4-
graft plugins
5-
graft samples
6-
graft docs
3+
recursive-include etc configure.py
74

8-
graft tests
9-
graft plugins-builtin
10-
11-
include .bumpversion.cfg
12-
include .coveragerc
13-
include .gitattributes
14-
include .gitignore
15-
include .travis.yml
16-
include apache-2.0.LICENSE
17-
include appveyor.yml
18-
include AUTHORS.rst
19-
include azure-pipelines.yml
20-
include cc0-1.0.LICENSE
21-
include CHANGELOG.rst
22-
include codecov.yml
23-
include configure
24-
include configure.bat
25-
include conftest.py
26-
include CONTRIBUTING.rst
27-
include extractcode
28-
include extractcode.bat
29-
include MANIFEST.in
5+
include *.LICENSE
306
include NOTICE
31-
include README.rst
32-
include scancode
33-
include scancode-toolkit.ABOUT
34-
include scancode.bat
35-
include setup.cfg
36-
include setup.py
37-
38-
exclude SCANCODE_DEV_MODE
7+
include *.ABOUT
8+
include *.toml
9+
include *.rst
10+
include setup.*
11+
include configure*
12+
include extractcode*
13+
include scancode*
14+
include Dockerfile
15+
include requirements*
3916

4017
global-exclude *.py[co] __pycache__ *.*~
18+

0 commit comments

Comments
 (0)