Skip to content

Commit 0c5d140

Browse files
Merge branch 'develop' into support-py-314
Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>
2 parents cc75e3f + fa63f1a commit 0c5d140

35 files changed

Lines changed: 574 additions & 63 deletions

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ WORKDIR /scancode-toolkit
3838
COPY . /scancode-toolkit
3939

4040
# Initial configuration using ./configure, scancode-reindex-licenses to build
41-
# the base license index
41+
# the base license index and scancode-reindex-package-patterns to build the
42+
# package patterns cache
4243
RUN ./configure \
43-
&& ./venv/bin/scancode-reindex-licenses
44+
&& ./venv/bin/scancode-reindex-licenses \
45+
&& ./venv/bin/scancode-reindex-package-patterns
4446

4547
# Add scancode to path
4648
ENV PATH=/scancode-toolkit:$PATH

README.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
ScanCode Toolkit
33
================
44

5-
ScanCode Toolkit is a set of code scanning tools that detect the origin (copyrights), license and vulnerabilities of code, packages and dependencies in a codebase. ScanCode Toolkit is an `AboutCode project <https://aboutcode.org>`_.
5+
ScanCode Toolkit is a set of code scanning tools that detect the origin (copyrights), license and vulnerabilities of code,
6+
packages and dependencies in a codebase. ScanCode Toolkit is an `AboutCode project <https://aboutcode.org>`_.
67

78
Why Use ScanCode Toolkit?
89
=========================
910

10-
ScanCode Toolkit is the leading tool in scanning depth and accuracy, used by hundreds of software teams. You can use ScanCode Toolkit as a command line tool or as a library.
11+
ScanCode Toolkit is the leading tool in scanning depth and accuracy,
12+
used by hundreds of software teams. You can use ScanCode Toolkit
13+
as a command line tool or as a library.
1114

1215
Getting Started
1316
===============
@@ -84,7 +87,7 @@ Benefits of ScanCode
8487
Support
8588
=======
8689

87-
If you have a specific problem, suggestion or bug, please submit a
90+
If you have a specific problem, suggestion or bug, please submit a
8891
`GitHub issue <https://github.com/aboutcode-org/scancode-toolkit/issues>`_.
8992

9093
For quick questions or socializing, join the AboutCode community discussions on `Slack <https://join.slack.com/t/aboutcode-org/shared_invite/zt-3li3bfs78-mmtKG0Qhv~G2dSlNCZW2pA>`_.

docs/source/rst-snippets/cli-basic-options.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ documenting a program's options. For example:
3333
--system-package Scan ``<input>`` for installed system package
3434
databases.
3535

36+
--package-in-compiled Scan compiled executable binaries such as ELF,
37+
WinpE and Mach-O files, looking for structured
38+
package and dependency metadata. Note that looking for
39+
packages in binaries makes package scan slower.
40+
Currently supported compiled binaries: Go, Rust.
41+
3642
--package-only Faster package scan, scanning ``<input>`` for
3743
system and application packages, only for package
3844
metadata. This option is skipping

etc/release/scancode-create-pypi-wheel.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set -e
1919

2020
./configure --dev
2121
venv/bin/scancode-reindex-licenses
22+
venv/bin/scancode-reindex-package-patterns
2223

2324
python_tag=$( python -c "import platform;print(f\"cp{''.join(platform.python_version_tuple()[:2])}\")" )
2425

etc/release/scancode-create-release-app-linux.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ cp -r etc/thirdparty $release_dir/etc
6565
# Build the wheel
6666
./configure --dev
6767
venv/bin/scancode-reindex-licenses
68+
venv/bin/scancode-reindex-package-patterns
6869
venv/bin/python setup.py --quiet bdist_wheel --python-tag cp$python_version
6970

7071
cp -r \

etc/release/scancode-create-release-app-macos.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ cp -r etc/thirdparty $release_dir/etc
6363
# Build the wheel
6464
./configure --dev
6565
venv/bin/scancode-reindex-licenses
66+
venv/bin/scancode-reindex-package-patterns
6667
venv/bin/python setup.py --quiet bdist_wheel --python-tag cp$python_version
6768

6869
cp -r \

etc/release/scancode-create-release-app-windows.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ cp -r etc/thirdparty $release_dir/etc
6262
# Build the wheel
6363
./configure --dev
6464
venv/bin/scancode-reindex-licenses
65+
venv/bin/scancode-reindex-package-patterns
6566
venv/bin/python setup.py --quiet bdist_wheel --python-tag cp$python_version
6667

6768
cp -r \

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ license-expression==30.4.4
3939
lxml==6.0.2
4040
MarkupSafe==3.0.3
4141
more-itertools==10.7.0
42+
multiregex==2.0.3
4243
normality==2.6.1
4344
packageurl-python==0.17.1
4445
packaging==25.0

setup-mini.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ install_requires =
9090
license_expression >= 30.4.4
9191
lxml >= 5.4.0
9292
MarkupSafe >= 2.1.2
93+
multiregex >= 2.0.3
9394
normality <= 2.6.1
9495
packageurl_python >= 0.9.0
9596
packvers >= 21.0.0
@@ -124,7 +125,7 @@ where = src
124125

125126
[options.extras_require]
126127
full =
127-
typecode[full] >= 30.0.0
128+
typecode[full] >= 30.1.0
128129
extractcode[full] >= 31.0.0
129130

130131
dev =
@@ -157,6 +158,7 @@ packages =
157158
console_scripts =
158159
scancode = scancode.cli:scancode
159160
scancode-reindex-licenses = licensedcode.reindex:reindex_licenses
161+
scancode-reindex-package-patterns = packagedcode.cache:cache_package_patterns
160162
scancode-license-data = licensedcode.license_db:dump_scancode_license_data
161163
regen-package-docs = packagedcode.regen_package_docs:regen_package_docs
162164
add-required-phrases = licensedcode.required_phrases:add_required_phrases

setup.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ install_requires =
9292
license_expression >= 30.4.4
9393
lxml >= 5.4.0
9494
MarkupSafe >= 2.1.2
95+
multiregex >= 2.0.3
9596
normality <= 2.6.1
9697
packageurl_python >= 0.9.0
9798
packvers >= 21.0.0
@@ -116,7 +117,7 @@ install_requires =
116117
urlpy
117118
xmltodict >= 0.11.0
118119
typecode >= 30.1.0
119-
typecode[full] >= 30.0.1
120+
typecode[full] >= 30.1.0
120121
extractcode[full] >= 31.0.0
121122

122123

@@ -126,7 +127,7 @@ where = src
126127

127128
[options.extras_require]
128129
full =
129-
typecode[full] >= 30.0.0
130+
typecode[full] >= 30.1.0
130131
extractcode[full] >= 31.0.0
131132

132133
dev =
@@ -159,6 +160,7 @@ packages =
159160
console_scripts =
160161
scancode = scancode.cli:scancode
161162
scancode-reindex-licenses = licensedcode.reindex:reindex_licenses
163+
scancode-reindex-package-patterns = packagedcode.cache:cache_package_patterns
162164
scancode-license-data = licensedcode.license_db:dump_scancode_license_data
163165
regen-package-docs = packagedcode.regen_package_docs:regen_package_docs
164166
add-required-phrases = licensedcode.required_phrases:add_required_phrases

0 commit comments

Comments
 (0)