Skip to content

Commit 064d2d2

Browse files
committed
merge conflicts resolved
Signed-off-by: NucleonGodX <racerpro41@gmail.com>
2 parents 73d5eb9 + 857ab86 commit 064d2d2

Some content is hidden

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

52 files changed

+728
-240
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
max-parallel: 4
3333
matrix:
34-
python-version: ["3.10", "3.11", "3.12"]
34+
python-version: ["3.10", "3.11", "3.12", "3.13"]
3535

3636
steps:
3737
- name: Checkout code

.github/workflows/generate-sboms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
find scancodeio/ -type f -name "*.ABOUT" -exec cp {} "${{ env.INPUTS_PATH }}/about-files/" \;
3333
3434
- name: Resolve the dependencies using ScanCode-action
35-
uses: nexB/scancode-action@main
35+
uses: aboutcode-org/scancode-action@main
3636
with:
3737
pipelines: "resolve_dependencies:DynamicResolver"
3838
inputs-path: ${{ env.INPUTS_PATH }}

.github/workflows/pypi-release-aboutcode-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v5
1919
with:
20-
python-version: 3.12
20+
python-version: 3.13
2121

2222
- name: Install flot
2323
run: python -m pip install flot --user

.github/workflows/pypi-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v5
1919
with:
20-
python-version: 3.12
20+
python-version: 3.13
2121

2222
- name: Install pypa/build
2323
run: python -m pip install build --user

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ local
5151
*.rdb
5252
*.aof
5353
.vscode
54+
.ipynb_checkpoints
5455

5556
# This is only created when packaging for external redistribution
5657
/thirdparty/

CHANGELOG.rst

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

4-
v34.12.0 (unreleased)
5-
---------------------
4+
v35.1.0 (unreleased)
5+
--------------------
6+
7+
- Add a ``--fail-on-vulnerabilities`` option in ``check-compliance`` management command.
8+
When this option is enabled, the command will exit with a non-zero status if known
9+
vulnerabilities are detected in discovered packages and dependencies.
10+
Requires the ``find_vulnerabilities`` pipeline to be executed beforehand.
11+
https://github.com/aboutcode-org/scancode.io/pull/1702
12+
13+
v35.0.0 (2025-06-23)
14+
--------------------
15+
16+
- Add support for Python 3.13.
17+
Upgrade the base image in Dockerfile to ``python:3.13-slim``.
18+
https://github.com/aboutcode-org/scancode.io/pull/1469/files
19+
20+
- Display matched snippets details in "Resource viewer", including the package,
21+
resource, and similarity values.
22+
https://github.com/aboutcode-org/scancode.io/issues/1688
23+
24+
- Add filtering by label and pipeline in the ``flush-projects`` management command.
25+
Also, a new ``--dry-run`` option is available to test the filters before applying
26+
the deletion.
27+
https://github.com/aboutcode-org/scancode.io/pull/1690
28+
29+
- Add support for using Package URL (purl) as project input.
30+
This implementation is based on ``purl2url.get_download_url``.
31+
https://github.com/aboutcode-org/scancode.io/issues/1383
632

733
- Raise a ``MatchCodeIOException`` when the response from the MatchCode.io service is
834
not valid in ``send_project_json_to_matchcode``.
935
This generally means an issue on the MatchCode.io server side.
1036
https://github.com/aboutcode-org/scancode.io/issues/1665
1137

38+
- Upgrade Bulma CSS and Ace JS libraries to latest versions.
39+
Refine the CSS for the Resource viewer.
40+
https://github.com/aboutcode-org/scancode.io/pull/1692
41+
42+
- Add "(No value detected)" for Copyright and Holder charts.
43+
https://github.com/aboutcode-org/scancode.io/issues/1697
44+
45+
- Add "Package Compliance Alert" chart in the Policies section.
46+
https://github.com/aboutcode-org/scancode.io/pull/1699
47+
48+
- Update univers to v31.0.0, catch ``NotImplementedError`` in
49+
``get_unique_unresolved_purls``, and properly log error in project.
50+
https://github.com/aboutcode-org/scancode.io/pull/1700
51+
https://github.com/aboutcode-org/scancode.io/pull/1701
52+
1253
v34.11.0 (2025-05-02)
1354
---------------------
1455

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# ScanCode.io is a free software code scanning tool from nexB Inc. and others.
2121
# Visit https://github.com/aboutcode-org/scancode.io for support and download.
2222

23-
FROM python:3.12-slim
23+
FROM python:3.13-slim
2424

2525
LABEL org.opencontainers.image.source="https://github.com/aboutcode-org/scancode.io"
2626
LABEL org.opencontainers.image.description="ScanCode.io"

docs/automation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ automation methods such as a cron job or a git hook::
7979
Seamlessly integrate ScanCode.io into your GitHub Workflows to enable automated scans
8080
as an integral part of your development process.
8181

82-
Visit the `scancode-action repository <https://github.com/nexB/scancode-action>`_ to
83-
explore and learn more about the GitHub Action for ScanCode.io.
82+
Visit the `scancode-action repository <https://github.com/aboutcode-org/scancode-action>`_
83+
to explore and learn more about the GitHub Action for ScanCode.io.
8484
The repository provides detailed information, usage instructions,
8585
and configuration options to help you incorporate code scanning effortlessly into your
8686
workflows.

docs/command-line-interface.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,10 @@ Optional arguments:
497497
- ``--fail-level {ERROR,WARNING,MISSING}`` Compliance alert level that will cause the
498498
command to exit with a non-zero status. Default is ERROR.
499499

500+
- ``--fail-on-vulnerabilities`` Exit with a non-zero status if known vulnerabilities
501+
are detected in discovered packages and dependencies.
502+
Requires the ``find_vulnerabilities`` pipeline to be executed beforehand.
503+
500504
`$ scanpipe archive-project --project PROJECT`
501505
----------------------------------------------
502506

@@ -549,6 +553,14 @@ Optional arguments:
549553

550554
scanpipe flush-projects --retain-days 7
551555

556+
- ``--dry-run`` Do not delete any projects; just print the ones that would be flushed.
557+
558+
- ``--label LABELS`` Filter projects by the provided label.
559+
Multiple labels can be provided by using this argument multiple times.
560+
561+
- ``--pipeline PIPELINES`` Filter projects by the provided pipeline name.
562+
Multiple pipeline name can be provided by using this argument multiple times.
563+
552564
- ``--no-input`` Does not prompt the user for input of any kind.
553565

554566

docs/faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ How can I trigger a pipeline scan from a CI/CD, such as Jenkins, TeamCity or Azu
202202
You can refer to the :ref:`automation` to automate your projects management.
203203

204204
Also, A new GitHub action is available at
205-
`scancode-action repository <https://github.com/nexB/scancode-action>`_
205+
`scancode-action repository <https://github.com/aboutcode-org/scancode-action>`_
206206
to run ScanCode.io pipelines from your GitHub Workflows.
207207

208208
How can I get notified about my project progression?

0 commit comments

Comments
 (0)