Skip to content

Commit 0515605

Browse files
committed
resolve conflicts
Signed-off-by: Varsha U N <[email protected]>
2 parents 0cade5e + d9875ff commit 0515605

File tree

277 files changed

+21906
-3946
lines changed

Some content is hidden

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

277 files changed

+21906
-3946
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Generate SBOMS
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
tags:
7+
- "v*.*.*"
8+
9+
env:
10+
INPUTS_PATH: scancode-inputs
11+
12+
jobs:
13+
generate-sboms:
14+
runs-on: ubuntu-24.04
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
- name: Ensure INPUTS_PATH directory exists
21+
run: mkdir -p "${{ env.INPUTS_PATH }}"
22+
23+
- name: Build the Docker image from local Dockerfile
24+
run: docker build -t local-image .
25+
26+
- name: Run pip freeze inside the built Docker container
27+
run: docker run --rm local-image pip freeze --all --exclude scancodeio > "${{ env.INPUTS_PATH }}/requirements.txt"
28+
29+
- name: Collect all .ABOUT files in the scancodeio/ directory
30+
run: |
31+
mkdir -p "${{ env.INPUTS_PATH }}/about-files"
32+
find scancodeio/ -type f -name "*.ABOUT" -exec cp {} "${{ env.INPUTS_PATH }}/about-files/" \;
33+
34+
- name: Resolve the dependencies using ScanCode-action
35+
uses: nexB/scancode-action@main
36+
with:
37+
pipelines: "resolve_dependencies:DynamicResolver"
38+
inputs-path: ${{ env.INPUTS_PATH }}
39+
scancodeio-repo-branch: main

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: python -m pip install flot --user
2424

2525
- name: Build a binary wheel and a source tarball
26-
run: python -m flot --pyproject pipeline-pyproject.toml --sdist --wheel --output-dir dist/
26+
run: python -m flot --pyproject pipeline-pyproject.toml --sdist --wheel --output-dir dist/
2727

2828
- name: Publish to PyPI
2929
if: startsWith(github.ref, 'refs/tags')

.github/workflows/pypi-release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ jobs:
3838
path: dist/*
3939

4040
- name: Create a GitHub release
41-
uses: softprops/action-gh-release@v1
41+
uses: softprops/action-gh-release@v2
4242
with:
43+
generate_release_notes: true
4344
draft: false
4445
files: dist/*

CHANGELOG.rst

Lines changed: 252 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,264 @@
11
Changelog
22
=========
33

4-
v34.8.2 (unreleased)
4+
v34.12.0 (unreleased)
5+
---------------------
6+
7+
- Raise a ``MatchCodeIOException`` when the response from the MatchCode.io service is
8+
not valid in ``send_project_json_to_matchcode``.
9+
This generally means an issue on the MatchCode.io server side.
10+
https://github.com/aboutcode-org/scancode.io/issues/1665
11+
12+
v34.11.0 (2025-05-02)
13+
---------------------
14+
15+
- Add a ``UUID`` field on the DiscoveredDependency model.
16+
Use the UUID for the DiscoveredDependency spdx_id for better SPDX compatibility.
17+
https://github.com/aboutcode-org/scancode.io/issues/1651
18+
19+
- Add MatchCode-specific functions to compute fingerprints from stemmed code
20+
files. Update CodebaseResource file content view to display snippet matches,
21+
if available, when the codebase has been sent for matching to MatchCode.
22+
https://github.com/aboutcode-org/scancode.io/pull/1656
23+
24+
- Add the ability to export filtered QuerySet of a FilterView into the JSON format.
25+
https://github.com/aboutcode-org/scancode.io/pull/1572
26+
27+
- Include ``ProjectMessage`` records in the JSON output ``headers`` section.
28+
https://github.com/aboutcode-org/scancode.io/issues/1659
29+
30+
v34.10.1 (2025-03-26)
31+
---------------------
32+
33+
- Convert the ``declared_license`` field value return by ``python-inspector`` in
34+
``resolve_pypi_packages``.
35+
Resolving requirements.txt files will now return proper license data.
36+
https://github.com/aboutcode-org/scancode.io/issues/1598
37+
38+
- Add support for installing on Apple Silicon (macOS ARM64) in dev mode.
39+
https://github.com/aboutcode-org/scancode.io/pull/1646
40+
41+
v34.10.0 (2025-03-21)
42+
---------------------
43+
44+
- Rename the ``docker``, ``docker_windows``, and ``root_filesystem`` modules to
45+
``analyze_docker``, ``analyze_docker_windows``, and ``analyze_root_filesystem``
46+
for consistency.
47+
48+
- Refine and document the Webhook system
49+
https://github.com/aboutcode-org/scancode.io/issues/1587
50+
* Add UI to add/delete Webhooks from the project settings
51+
* Add a new ``add-webhook`` management command
52+
* Add a ``add_webhook`` REST API action
53+
* Add a new ``SCANCODEIO_GLOBAL_WEBHOOK`` setting
54+
* Add a new chapter dedicated to Webhooks management in the documentation
55+
* Add support for custom payload dedicated to Slack webhooks
56+
57+
- Upgrade Bulma CSS library to version 1.0.2
58+
https://github.com/aboutcode-org/scancode.io/pull/1268
59+
60+
- Disable the creation of the global webhook in the ``batch-create`` command by default.
61+
The global webhook can be created by providing the ``--create-global-webhook`` option.
62+
A ``--no-global-webhook`` option was also added to the ``create-project`` command to
63+
provide the ability to skip the global webhook creation.
64+
https://github.com/aboutcode-org/scancode.io/pull/1629
65+
66+
- Add support for "Permission denied" file access in make_codebase_resource.
67+
https://github.com/aboutcode-org/scancode.io/issues/1630
68+
69+
- Refine the ``scan_single_package`` pipeline to work on git fetched inputs.
70+
https://github.com/aboutcode-org/scancode.io/issues/1376
71+
72+
v34.9.5 (2025-02-19)
73+
--------------------
74+
75+
- Add support for the XLSX report in REST API.
76+
https://github.com/aboutcode-org/scancode.io/issues/1524
77+
78+
- Add options to the Project reset action.
79+
Also, the Project labels are kept during reset.
80+
https://github.com/aboutcode-org/scancode.io/issues/1568
81+
82+
- Add aboutcode.pipeline as an install_requires external dependency to prevent conflicts
83+
with other aboutcode submodules.
84+
https://github.com/aboutcode-org/scancode.io/issues/1423
85+
86+
- Add a ``add-webhook`` management command that allows to add webhook subscription on
87+
a project.
88+
https://github.com/aboutcode-org/scancode.io/issues/1587
89+
90+
- Add proper progress logging for the ``assemble`` section of the
91+
``scan_for_application_packages``.
92+
https://github.com/aboutcode-org/scancode.io/issues/1601
93+
94+
v34.9.4 (2025-01-21)
95+
--------------------
96+
97+
- Improve Project list page navigation.
98+
A top previous/next page navigation was added in the header for consistency with other
99+
list views.
100+
Any paginated view can now be navigated using the left/right keyboard keys.
101+
https://github.com/aboutcode-org/scancode.io/issues/1200
102+
103+
- Add support for importing the ``extra_data`` value from the JSON input with the
104+
``load_inventory`` pipeline.
105+
When multiple JSON files are provided as inputs, the ``extra`` is prefixed with
106+
the input filename.
107+
https://github.com/aboutcode-org/scancode.io/issues/926
108+
109+
- Disable CycloneDX document strict validation, which halts the entire loading process,
110+
and let the data loading process handle the data issues.
111+
https://github.com/aboutcode-org/scancode.io/issues/1515
112+
113+
- Add a report action on project list to export XLSX containing packages from selected
114+
projects.
115+
https://github.com/aboutcode-org/scancode.io/issues/1437
116+
117+
- Add a download action on project list to enable bulk download of Project output files.
118+
https://github.com/aboutcode-org/scancode.io/issues/1518
119+
120+
- Add labels to Project level search.
121+
The labels are now always presented in alphabetical order for consistency.
122+
https://github.com/aboutcode-org/scancode.io/issues/1520
123+
124+
- Add a ``batch-create`` management command that allows to create multiple projects
125+
at once from a directory containing input files.
126+
https://github.com/aboutcode-org/scancode.io/issues/1437
127+
128+
- Do not download input_urls in management commands. The fetch/download is delegated to
129+
the pipeline execution.
130+
https://github.com/aboutcode-org/scancode.io/issues/1437
131+
132+
- Add a "TODOS" sheet containing on REQUIRES_REVIEW resources in XLSX.
133+
https://github.com/aboutcode-org/scancode.io/issues/1524
134+
135+
- Improve XLSX output for Vulnerabilities.
136+
Replace the ``affected_by_vulnerabilities`` field in the PACKAGES and DEPENDENCIES
137+
sheets with a dedicated VULNERABILITIES sheet.
138+
https://github.com/aboutcode-org/scancode.io/issues/1519
139+
140+
- Keep the InputSource objects when using ``reset`` on Projects.
141+
https://github.com/aboutcode-org/scancode.io/issues/1536
142+
143+
- Add a ``report`` management command that allows to generate XLSX reports for
144+
multiple projects at once using labels and searching by project name.
145+
https://github.com/aboutcode-org/scancode.io/issues/1524
146+
147+
- Add the ability to "select across" in Projects list when using the "select all"
148+
checkbox on paginated list.
149+
https://github.com/aboutcode-org/scancode.io/issues/1524
150+
151+
- Update scancode-toolkit to v32.3.2. See CHANGELOG for updates:
152+
https://github.com/aboutcode-org/scancode-toolkit/releases/tag/v32.3.2
153+
https://github.com/aboutcode-org/scancode-toolkit/releases/tag/v32.3.1
154+
155+
- Adds a project settings ``scan_max_file_size`` and a scancode.io settings field
156+
``SCANCODEIO_SCAN_MAX_FILE_SIZE`` to skip scanning files above a certain
157+
file size (in bytes) as a temporary fix for large memory spikes while
158+
scanning for licenses in certain large files.
159+
https://github.com/aboutcode-org/scancode-toolkit/issues/3711
160+
161+
v34.9.3 (2024-12-31)
162+
--------------------
163+
164+
- Refine the available settings for RQ_QUEUES:
165+
* Rename the RQ_QUEUES sub-settings to SCANCODEIO_RQ_REDIS_*
166+
* Add SCANCODEIO_RQ_REDIS_SSL setting to enable SSL.
167+
https://github.com/aboutcode-org/scancode.io/issues/1465
168+
169+
- Add support to map binaries to source files using symbols
170+
for rust binaries and source files. This adds also using
171+
``rust-inspector`` to extract symbols from rust binaries.
172+
This is a new optional ``Rust`` step in the
173+
``map_deploy_to_develop`` pipeline.
174+
https://github.com/aboutcode-org/scancode.io/issues/1435
175+
176+
v34.9.2 (2024-12-10)
177+
--------------------
178+
179+
- Fix an issue with the ``scan_rootfs_for_system_packages`` pipe when a namespace is
180+
missing for the discovered packages.
181+
https://github.com/aboutcode-org/scancode.io/issues/1462
182+
183+
v34.9.1 (2024-12-09)
184+
--------------------
185+
186+
- Add the ability to filter on Project endpoint API actions.
187+
The list of ``resources``, ``packages``, ``dependencies``, ``relations``, and
188+
``messages`` can be filtered providing the ``?field_name=value`` in the URL
189+
parameters.
190+
https://github.com/aboutcode-org/scancode.io/issues/1449
191+
192+
- Fix the ability to provide multiple optional step when defining pipelines in the
193+
REST API.
194+
The support for providing pipeline names as a comma-separated single string was
195+
remove as the comma is used as the optional step separator.
196+
Use a list of pipeline names instead.
197+
https://github.com/aboutcode-org/scancode.io/issues/1454
198+
199+
- Make the header row of tables sticky to the top of the screen so it is always
200+
visible.
201+
https://github.com/aboutcode-org/scancode.io/issues/1457
202+
203+
v34.9.0 (2024-11-14)
204+
--------------------
205+
206+
- Add ability to declared pipeline selected groups in create project REST API endpoint.
207+
https://github.com/aboutcode-org/scancode.io/issues/1426
208+
209+
- Add a new ``list-pipelines`` management command.
210+
https://github.com/aboutcode-org/scancode.io/issues/1397
211+
212+
- Refactor the policies related code to its own module.
213+
https://github.com/aboutcode-org/scancode.io/issues/386
214+
215+
- Add support for project-specific license policies and compliance alerts.
216+
Enhance Project model to handle policies from local settings, project input
217+
"policies.yml" files, or global app settings.
218+
https://github.com/aboutcode-org/scancode.io/issues/386
219+
220+
- Refactor the ``group`` decorator for pipeline steps as ``optional_step``.
221+
The steps decorated as optional are not included by default anymore.
222+
https://github.com/aboutcode-org/scancode.io/issues/386
223+
224+
- Add a new ``PublishToFederatedCode`` pipeline (addon) to push scan result
225+
to FederatedCode.
226+
https://github.com/nexB/scancode.io/pull/1400
227+
228+
- Add new ``purl`` field to project model. https://github.com/nexB/scancode.io/pull/1400
229+
230+
v34.8.3 (2024-10-30)
231+
--------------------
232+
233+
- Include the ``aboutcode`` module in the wheel and source distribution.
234+
https://github.com/aboutcode-org/scancode.io/issues/1423
235+
236+
- Update ScanCode-toolkit to v32.3.0
237+
https://github.com/aboutcode-org/scancode.io/issues/1418
238+
239+
v34.8.2 (2024-10-28)
5240
--------------------
6241

7242
- Add ``android_analysis`` to ``extra_requires``. This installs the package
8243
``android_inspector``, which provides a pipeline for Android APK
9244
deploy-to-development analysis.
10245

246+
- Remove the sleep time in the context of testing ``matchcode.poll_run_url_status``
247+
to speed up the test.
248+
https://github.com/aboutcode-org/scancode.io/issues/1411
249+
250+
- Add ability to specify the CycloneDX output spec version using the ``output``
251+
management command and providing the ``cyclonedx:VERSION`` syntax as format value.
252+
https://github.com/aboutcode-org/scancode-action/issues/8
253+
254+
- Add new ``compliance`` REST API action that list all compliance alert for a given
255+
project. The severity level can be provided using the
256+
``?fail_level={ERROR,WARNING,MISSING}`` parameter.
257+
https://github.com/aboutcode-org/scancode.io/issues/1346
258+
259+
- Add new ``Compliance alerts`` panel in the project detail view.
260+
https://github.com/aboutcode-org/scancode.io/issues/1346
261+
11262
v34.8.1 (2024-09-06)
12263
--------------------
13264

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ include .VERSION
1515

1616
graft scancodeio
1717
graft scanpipe
18+
graft aboutcode
1819
graft docs
1920
graft etc
2021
graft .github/workflows

Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ VENV_LOCATION=.venv
2626
ACTIVATE?=. ${VENV_LOCATION}/bin/activate;
2727
MANAGE=${VENV_LOCATION}/bin/python manage.py
2828
VIRTUALENV_PYZ=etc/thirdparty/virtualenv.pyz
29+
PIP_ARGS=--find-links=./etc/thirdparty/dummy_dist
2930
# Do not depend on Python to generate the SECRET_KEY
3031
GET_SECRET_KEY=`head -c50 /dev/urandom | base64 | head -c50`
3132
# Customize with `$ make envfile ENV_FILE=/etc/scancodeio/.env`
@@ -51,11 +52,11 @@ virtualenv:
5152

5253
conf: virtualenv
5354
@echo "-> Install dependencies"
54-
@${ACTIVATE} pip install -e .
55+
@${ACTIVATE} pip install ${PIP_ARGS} --editable .
5556

5657
dev: virtualenv
5758
@echo "-> Configure and install development dependencies"
58-
@${ACTIVATE} pip install -e .[dev]
59+
@${ACTIVATE} pip install ${PIP_ARGS} --editable .[dev]
5960

6061
envfile:
6162
@echo "-> Create the .env file and generate a secret key"
@@ -79,6 +80,8 @@ check:
7980
@echo "-> Run Ruff format validation"
8081
@${ACTIVATE} ruff format --check
8182
@$(MAKE) doc8
83+
@echo "-> Run ABOUT files validation"
84+
@${ACTIVATE} about check --exclude .venv/ --exclude scanpipe/tests/ .
8285

8386
check-deploy:
8487
@echo "-> Check Django deployment settings"
@@ -121,6 +124,10 @@ sqlitedb:
121124
run:
122125
${MANAGE} runserver 8001 --insecure
123126

127+
run-docker-dev:
128+
@echo "-> Run the Docker compose services in dev mode (hot reload on code changes)"
129+
docker compose -f docker-compose.yml -f docker-compose.dev.yml up --build --watch
130+
124131
test:
125132
@echo "-> Run the test suite"
126133
${MANAGE} test --noinput
@@ -156,4 +163,4 @@ offline-package: docker-images
156163
@mkdir -p dist/
157164
@tar -cf dist/scancodeio-offline-package-`git describe --tags`.tar build/
158165

159-
.PHONY: virtualenv conf dev envfile install doc8 check valid check-deploy clean migrate upgrade postgresdb sqlitedb backupdb run test fasttest docs bump docker-images offline-package
166+
.PHONY: virtualenv conf dev envfile install doc8 check valid check-deploy clean migrate upgrade postgresdb sqlitedb backupdb run run-docker-dev test fasttest docs bump docker-images offline-package

0 commit comments

Comments
 (0)