Skip to content

Commit

Permalink
Merge branch 'aboutcode-org:develop' into issue3477
Browse files Browse the repository at this point in the history
  • Loading branch information
NucleonGodX authored Jan 18, 2025
2 parents 5399fdd + 1250647 commit 08110b8
Show file tree
Hide file tree
Showing 117 changed files with 12,351 additions and 275 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/scancode-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-22.04, ubuntu-24.04, macos-12, macos-13]
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
pyver: ["3.9", "3.10", "3.11", "3.12"]

steps:
Expand Down Expand Up @@ -371,7 +371,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [macos-12, macos-13]
os: [macos-13, macos-14]
pyver: ["3.9", "3.10", "3.11", "3.12"]

steps:
Expand Down
32 changes: 30 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ v33.0.0 (next next, roadmap)
- Dependencies for
- Support for copyright detection objects.

- We can now collect packages from a Go binary using go-inspector (Linux-only)

- A new field in packages with the license category for the
detected license expression and also an API function to
compute license categories from license expressions.
Expand All @@ -40,6 +38,33 @@ v33.0.0 (next next, roadmap)
- Update Dockerfile and test container build.
See https://github.com/aboutcode-org/scancode-toolkit/issues/3955

v32.3.1 - 2024-01-06
--------------------

This is a minor release with license and package detection
improvements, bugfixes and with new and updated license detection rules
and new licenses added.

- We can now collect packages from a Rust binary using rust-inspector
for rust binaries built with `cargo-auditable`(Linux-only)
Also adds a plugin for colelcting rust symbols with the option
``--rust-symbol``. See the initial release for more info:
https://github.com/aboutcode-org/rust-inspector/releases/tag/v0.1.0
https://github.com/aboutcode-org/scancode-toolkit/pull/4043

- Improves and adds bugfixes for package detection in the following ecosystems:
conda, npm, rust, go.
https://github.com/aboutcode-org/scancode-toolkit/pull/4073

- Updates go-inspector to v0.5.0 . GoReSym is now built from source and has
been updated to v3.0.1. https://github.com/aboutcode-org/scancode-toolkit/pull/3972

- Adds new and updated licenses, license detection rules.
https://github.com/aboutcode-org/scancode-toolkit/pull/3963

- Adds the latest license-expression with an updated licenseDB.
https://github.com/aboutcode-org/scancode-toolkit/pull/3960

v32.3.0 - 2024-10-21
--------------------

Expand Down Expand Up @@ -89,6 +114,9 @@ Changes in Output Data Structure:
- Drop python 3.8 support as this is end of life. Please use older releases if you
are using python 3.8 but this is not recommended.

- We can now collect packages from a Go binary using go-inspector (Linux-only)
See https://github.com/aboutcode-org/scancode-toolkit/pull/3894

v32.2.1 - 2024-07-02
---------------------

Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ jobs:

- template: etc/ci/azure-posix.yml
parameters:
job_name: macos12_cpython
image_name: macOS-12
job_name: macos14_cpython
image_name: macOS-14
python_versions: ['3.9', '3.10', '3.11', '3.12']
python_architecture: x64
test_suites:
Expand Down Expand Up @@ -233,8 +233,8 @@ jobs:

- template: etc/ci/azure-posix.yml
parameters:
job_name: macos12_cpython_latest_from_pip
image_name: macos-12
job_name: macos14_cpython_latest_from_pip
image_name: macos-14
python_versions: ['3.9', '3.10', '3.11', '3.12']
test_suites:
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0 AND MIT
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
# ScanCode is a trademark of nexB Inc.
# See https://github.com/nexB/ for support or download.
# See https://github.com/aboutcode-org/ for support or download.
# See https://aboutcode.org for more information about nexB OSS projects.
#

Expand Down
2 changes: 1 addition & 1 deletion configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@rem Copyright (c) nexB Inc. and others. All rights reserved.
@rem SPDX-License-Identifier: Apache-2.0
@rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
@rem See https://github.com/nexB/ for support or download.
@rem See https://github.com/aboutcode-org/ for support or download.
@rem See https://aboutcode.org for more information about nexB OSS projects.


Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

# This points to aboutcode.readthedocs.io
# In case of "undefined label" ERRORS check docs on intersphinx to troubleshoot
# Link was created at commit - https://github.com/nexB/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83
# Link was created at commit - https://github.com/aboutcode-org/aboutcode/commit/faea9fcf3248f8f198844fe34d43833224ac4a83

intersphinx_mapping = {
"aboutcode": ("https://aboutcode.readthedocs.io/en/latest/", None),
Expand Down
Loading

0 comments on commit 08110b8

Please sign in to comment.