Skip to content

Commit cafcbcf

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
authored
Merge pull request #3701 from nexB/release-prep-v32.1.0
Release prep v32.1.0
2 parents 6c15ebf + 3992030 commit cafcbcf

File tree

18 files changed

+65
-62
lines changed

18 files changed

+65
-62
lines changed

‎.github/workflows/scancode-release.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -457,12 +457,6 @@ jobs:
457457
name: source_app
458458
path: dist
459459

460-
- name: Download a single artifact macos_app for python 3.7
461-
uses: actions/download-artifact@v3
462-
with:
463-
name: macos_app_py_3.7
464-
path: dist
465-
466460
- name: Download a single artifact macos_app for python 3.8
467461
uses: actions/download-artifact@v3
468462
with:
@@ -487,10 +481,10 @@ jobs:
487481
name: macos_app_py_3.11
488482
path: dist
489483

490-
- name: Download a single artifact linux_app for python 3.7
484+
- name: Download a single artifact macos_app for python 3.12
491485
uses: actions/download-artifact@v3
492486
with:
493-
name: linux_app_py_3.7
487+
name: macos_app_py_3.12
494488
path: dist
495489

496490
- name: Download a single artifact linux_app for python 3.8
@@ -517,10 +511,10 @@ jobs:
517511
name: linux_app_py_3.11
518512
path: dist
519513

520-
- name: Download a single artifact windows_app for python 3.7
514+
- name: Download a single artifact linux_app for python 3.12
521515
uses: actions/download-artifact@v3
522516
with:
523-
name: windows_app_py_3.7
517+
name: linux_app_py_3.12
524518
path: dist
525519

526520
- name: Download a single artifact windows_app for python 3.8
@@ -547,6 +541,12 @@ jobs:
547541
name: windows_app_py_3.11
548542
path: dist
549543

544+
- name: Download a single artifact windows_app for python 3.12
545+
uses: actions/download-artifact@v3
546+
with:
547+
name: windows_app_py_3.12
548+
path: dist
549+
550550
- name: Mock GH release
551551
run: |
552552
ls -al dist
@@ -573,7 +573,7 @@ jobs:
573573
strategy:
574574
fail-fast: true
575575
matrix:
576-
dist_names: ["wheels-3.7", "wheels-3.8", "wheels-3.9", "wheels-3.10", "wheels-3.11", sdists]
576+
dist_names: ["wheels-3.8", "wheels-3.9", "wheels-3.10", "wheels-3.11", "wheels-3.12", sdists]
577577

578578
steps:
579579
- name: Set up Python
@@ -592,6 +592,6 @@ jobs:
592592
ls -al dist
593593
594594
- name: Publish distributions to PyPI
595-
uses: pypa/gh-action-pypi-publish@master
595+
uses: pypa/gh-action-pypi-publish@release/v1
596596
with:
597597
password: ${{ secrets.PYPI_API_TOKEN }}

‎INSTALL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Prerequisites
1616
-------------
1717

1818
Before installing ScanCode make sure you have installed these prerequisites.
19-
The main one is to have Python installed version 3.7, 3.8, 3.9 or 3.10
19+
The main one is to have Python installed version 3.8, 3.9, 3.10, 3.11 or 3.12
2020

2121
- For Linux(Ubuntu): ``sudo apt install python3.8-dev bzip2 xz-utils zlib1g libxml2-dev libxslt1-dev``
2222
- For MacOS: Install Python 3.x from https://www.python.org/

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Installation
140140

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

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

‎docs/source/contribute/contrib_dev.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ recursive dependencies.
186186

187187
There are utility scripts in ``etc/release`` that can help with the dependencies
188188
management process in particular to build or update wheels with native code for
189-
multiple OSes (Linux, macOS and Windows) and multiple Python versions (3.7+),
189+
multiple OSes (Linux, macOS and Windows) and multiple Python versions (3.8+),
190190
which is not a completely simple operation (and requires eventually 12 wheels
191-
and one source distribution to be published as we support 3 OSes and 4 Python
191+
and one source distribution to be published as we support 3 OSes and 5 Python
192192
versions).
193193

194194

‎docs/source/getting-started/install.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For advanced usage and experienced users, you can also use any of these mode:
3939
Before Installing
4040
-----------------
4141

42-
- ScanCode requires a Python version 3.7, 3.8, 3.9 or 3.10 and is
42+
- ScanCode requires a Python version between 3.8 to 3.12 and is
4343
tested on Linux, macOS, and Windows. It should work fine on FreeBSD.
4444

4545
.. _system_requirements:
@@ -66,8 +66,8 @@ System Requirements
6666
Prerequisites
6767
^^^^^^^^^^^^^
6868

69-
ScanCode needs a Python 3.7+ interpreter; We support all Python versions from
70-
3.7 to 3.10. The default version for the application archives is Python 3.8
69+
ScanCode needs a Python 3.8+ interpreter; We support all Python versions from
70+
3.8 to 3.12. The default version for the application archives is Python 3.8
7171

7272
- **On Linux**:
7373

‎etc/scripts/utils_thirdparty.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@
115115
TRACE_ULTRA_DEEP = False
116116

117117
# Supported environments
118-
PYTHON_VERSIONS = "37", "38", "39", "310", "311"
118+
PYTHON_VERSIONS = "38", "39", "310", "311", "312"
119119

120120
PYTHON_DOT_VERSIONS_BY_VER = {
121-
"37": "3.7",
122121
"38": "3.8",
123122
"39": "3.9",
124123
"310": "3.10",
125124
"311": "3.11",
125+
"312": "3.12",
126126
}
127127

128128

@@ -134,11 +134,11 @@ def get_python_dot_version(version):
134134

135135

136136
ABIS_BY_PYTHON_VERSION = {
137-
"37": ["cp37", "cp37m", "abi3"],
138137
"38": ["cp38", "cp38m", "abi3"],
139138
"39": ["cp39", "cp39m", "abi3"],
140139
"310": ["cp310", "cp310m", "abi3"],
141140
"311": ["cp311", "cp311m", "abi3"],
141+
"312": ["cp312", "cp312m", "abi3"],
142142
}
143143

144144
PLATFORMS_BY_OS = {

‎requirements-native.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
cffi==1.15.1
1+
cffi==1.16.0
22
intbitset==3.1.0
3-
lxml==4.9.4
4-
MarkupSafe==2.1.1
5-
pyahocorasick==2.0.0
6-
PyYAML==6.0
3+
lxml==5.1.0
4+
MarkupSafe==2.1.5
5+
pyahocorasick==2.1.0
6+
PyYAML==6.0.1

‎requirements.txt

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
attrs==22.1.0
1+
attrs==23.2.0
22
banal==1.0.6
3-
beautifulsoup4==4.11.1
3+
beautifulsoup4==4.12.3
44
binaryornot==0.4.4
5+
beartype==0.17.2
56
boolean.py==4.0
6-
certifi==2022.6.15
7-
cffi==1.15.1
7+
certifi==2024.2.2
8+
cffi==1.16.0
89
chardet==5.0.0
910
charset-normalizer==2.1.0
10-
click==8.1.3
11+
click==8.1.7
1112
colorama==0.4.5
1213
commoncode==31.0.3
1314
construct==2.10.68
1415
container-inspector==31.1.0
15-
cryptography==37.0.4
16+
cryptography==42.0.5
1617
debian-inspector==31.1.0
1718
dockerfile-parse==1.2.0
1819
dparse2==0.7.0
@@ -32,14 +33,14 @@ intbitset==3.1.0
3233
isodate==0.6.1
3334
jaraco.functools==3.5.1
3435
javaproperties==0.8.1
35-
Jinja2==3.1.2
36+
Jinja2==3.1.3
3637
jsonstreams==0.6.0
37-
license-expression==30.1.1
38-
lxml==4.9.4
39-
MarkupSafe==2.1.2
38+
license-expression==30.3.0
39+
lxml==5.1.0
40+
MarkupSafe==2.1.5
4041
more-itertools==8.13.0
4142
normality==2.3.3
42-
packageurl-python==0.10.0
43+
packageurl-python==0.15.0
4344
packaging==21.3
4445
packvers==21.5
4546
parameter-expansion-patched==0.3.1
@@ -51,26 +52,28 @@ pluggy==1.0.0
5152
plugincode==32.0.0
5253
ply==3.11
5354
publicsuffix2==2.20191221
54-
pyahocorasick==2.0.0
55+
pyahocorasick==2.1.0
5556
pycparser==2.21
5657
pygmars==0.7.0
5758
Pygments==2.13.0
58-
pymaven-patch==0.3.0
59+
pymaven-patch==0.3.2
5960
pyparsing==3.0.9
6061
pytz==2022.1
61-
PyYAML==6.0
62+
PyYAML==6.0.1
6263
rdflib==6.2.0
63-
requests==2.28.1
64+
requests==2.31.0
6465
saneyaml==0.6.0
66+
semantic-version==2.8.5
6567
six==1.16.0
6668
soupsieve==2.3.2.post1
67-
spdx-tools==0.8.1
69+
spdx-tools==0.8.2
6870
text-unidecode==1.3
6971
toml==0.10.2
7072
typecode==30.0.1
7173
typecode-libmagic==5.39.210531
7274
typing-extensions==4.3.0
73-
urllib3==1.26.11
75+
uritools==4.0.2
76+
urllib3==2.2.1
7477
urlpy==0.5
7578
wcwidth==0.2.5
7679
webencodings==0.5.1

‎setup-mini.cfg

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = scancode-toolkit-mini
3-
version = 32.0.8
3+
version = 32.1.0
44
license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
55

66
# description must be on ONE line https://github.com/pypa/setuptools/issues/1390
@@ -17,11 +17,11 @@ classifiers =
1717
Intended Audience :: Developers
1818
Programming Language :: Python :: 3
1919
Programming Language :: Python :: 3 :: Only
20-
Programming Language :: Python :: 3.7
2120
Programming Language :: Python :: 3.8
2221
Programming Language :: Python :: 3.9
2322
Programming Language :: Python :: 3.10
2423
Programming Language :: Python :: 3.11
24+
Programming Language :: Python :: 3.12
2525
Topic :: Software Development
2626
Topic :: Utilities
2727

@@ -60,7 +60,7 @@ zip_safe = false
6060
py_modules =
6161
scancode_config
6262

63-
python_requires = >=3.7
63+
python_requires = >=3.8
6464

6565
install_requires =
6666
attrs >= 18.1,!=20.1.0;python_version<'3.11'
@@ -70,7 +70,7 @@ install_requires =
7070
chardet >= 3.0.0
7171
click >= 6.7, !=7.0
7272
colorama >= 0.3.9
73-
commoncode >= 31.0.2
73+
commoncode >= 31.0.3
7474
container-inspector >= 31.0.0
7575
debian-inspector >= 31.1.0
7676
dparse2 >= 0.7.0
@@ -105,7 +105,7 @@ install_requires =
105105
pymaven_patch >= 0.2.8
106106
requests >= 2.7.0
107107
saneyaml >= 0.6.0
108-
spdx_tools == 0.8.1
108+
spdx_tools == 0.8.2
109109
text_unidecode >= 1.0
110110
toml >= 0.10.0
111111
urlpy

‎setup.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = scancode-toolkit
3-
version = 32.0.8
3+
version = 32.1.0
44
license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
55

66
# description must be on ONE line https://github.com/pypa/setuptools/issues/1390
@@ -17,11 +17,11 @@ classifiers =
1717
Intended Audience :: Developers
1818
Programming Language :: Python :: 3
1919
Programming Language :: Python :: 3 :: Only
20-
Programming Language :: Python :: 3.7
2120
Programming Language :: Python :: 3.8
2221
Programming Language :: Python :: 3.9
2322
Programming Language :: Python :: 3.10
2423
Programming Language :: Python :: 3.11
24+
Programming Language :: Python :: 3.12
2525
Topic :: Software Development
2626
Topic :: Utilities
2727

@@ -60,7 +60,7 @@ zip_safe = false
6060
py_modules =
6161
scancode_config
6262

63-
python_requires = >=3.7
63+
python_requires = >=3.8
6464

6565
install_requires =
6666
attrs >= 18.1,!=20.1.0;python_version<'3.11'
@@ -105,7 +105,7 @@ install_requires =
105105
pymaven_patch >= 0.2.8
106106
requests >= 2.7.0
107107
saneyaml >= 0.6.0
108-
spdx_tools == 0.8.1
108+
spdx_tools == 0.8.2
109109
text_unidecode >= 1.0
110110
toml >= 0.10.0
111111
urlpy

‎src/scancode_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ def _create_dir(location):
132132
# 4. hardcoded This is the default, fallback version in case package is not installed or we
133133
# do not have a proper version otherwise.
134134
if not __version__:
135-
__version__ = '32.0.8'
135+
__version__ = '32.1.0'
136136

137137
#######################
138138
# used to warn user when the version is out of date
139139
# this is (year, month, day)
140-
__release_date__ = datetime.datetime(2023, 10, 11)
140+
__release_date__ = datetime.datetime(2024, 3, 22)
141141

142142
# See https://github.com/nexB/scancode-toolkit/issues/2653 for more information
143143
# on the data format version

‎tests/formattedcode/data/spdx/license_known/expected.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX License List: 3.23</text>
1616
PackageName: scan
1717
SPDXID: SPDXRef-001
1818
PackageDownloadLocation: NOASSERTION
19-
FilesAnalyzed: True
19+
FilesAnalyzed: true
2020
PackageVerificationCode: 517c26f04b5a3edaaa0c17bf1a6571953209e209
2121
PackageLicenseConcluded: NOASSERTION
2222
PackageLicenseInfoFromFiles: Apache-2.0

‎tests/formattedcode/data/spdx/license_known/expected_with_text.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX License List: 3.23</text>
1616
PackageName: scan
1717
SPDXID: SPDXRef-001
1818
PackageDownloadLocation: NOASSERTION
19-
FilesAnalyzed: True
19+
FilesAnalyzed: true
2020
PackageVerificationCode: 517c26f04b5a3edaaa0c17bf1a6571953209e209
2121
PackageLicenseConcluded: NOASSERTION
2222
PackageLicenseInfoFromFiles: Apache-2.0

‎tests/formattedcode/data/spdx/license_ref/expected.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX License List: 3.23</text>
1616
PackageName: scan
1717
SPDXID: SPDXRef-001
1818
PackageDownloadLocation: NOASSERTION
19-
FilesAnalyzed: True
19+
FilesAnalyzed: true
2020
PackageVerificationCode: b49eeefd776fb76555378d07fd05d986a249a2b3
2121
PackageLicenseConcluded: NOASSERTION
2222
PackageLicenseInfoFromFiles: Apache-2.0

‎tests/formattedcode/data/spdx/license_ref/expected_with_text.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX License List: 3.23</text>
1616
PackageName: scan
1717
SPDXID: SPDXRef-001
1818
PackageDownloadLocation: NOASSERTION
19-
FilesAnalyzed: True
19+
FilesAnalyzed: true
2020
PackageVerificationCode: b49eeefd776fb76555378d07fd05d986a249a2b3
2121
PackageLicenseConcluded: NOASSERTION
2222
PackageLicenseInfoFromFiles: Apache-2.0

‎tests/formattedcode/data/spdx/simple/expected.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX License List: 3.23</text>
1616
PackageName: simple
1717
SPDXID: SPDXRef-001
1818
PackageDownloadLocation: NOASSERTION
19-
FilesAnalyzed: True
19+
FilesAnalyzed: true
2020
PackageVerificationCode: a83523bcfc10441aa94a575b88aa1d3269902485
2121
PackageLicenseConcluded: NOASSERTION
2222
PackageLicenseInfoFromFiles: NONE

‎tests/formattedcode/data/spdx/tree/expected.tv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SPDX License List: 3.23</text>
1616
PackageName: scan
1717
SPDXID: SPDXRef-001
1818
PackageDownloadLocation: NOASSERTION
19-
FilesAnalyzed: True
19+
FilesAnalyzed: true
2020
PackageVerificationCode: ed7a0c42e0411fe584d7c6d04105416593624be3
2121
PackageLicenseConcluded: NOASSERTION
2222
PackageLicenseInfoFromFiles: NONE

0 commit comments

Comments
 (0)