Skip to content

Commit 12e8f4c

Browse files
committed
Merge latest develop
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2 parents 9a58a12 + 6a9db8f commit 12e8f4c

Some content is hidden

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

48 files changed

+2769
-253
lines changed

.github/ISSUE_TEMPLATE/--doc-report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
name: "Documentation Improvement"
2+
name: Documentation Improvement
33
about: Your suggestions for improving the scancode-toolkit Documentation.
44
title: ''
5-
labels: 'documentation'
5+
labels: documentation
66
assignees: ''
77

88
---
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: New License Request
3+
about: Request a new license for scancode detection purposes
4+
title: 'New license request: '
5+
labels: new-license
6+
assignees: DennisClark
7+
8+
---
9+
10+
**License Name**
11+
The full name of the license, preferably as provided by the original authors.
12+
13+
**License Homepage URL**
14+
The primary and/or most reliable URL that contains the text of this license and/or information about it. This is ideally a web page dedicated to the license, but it may also be a source file that contains the license text.
15+
16+
**Reference URLs**
17+
Optionally provide URLs that contain references to the license.
18+
19+
**License Notes**
20+
Optionally describe any aspects of the license that deserve special attention.

.github/workflows/about-files-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ permissions:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-24.04
1111

1212
strategy:
1313
max-parallel: 4
1414
matrix:
15-
python-version: [3.9]
15+
python-version: [3.11]
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Set up Python ${{ matrix.python-version }}
2222
uses: actions/setup-python@v4

azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- template: etc/ci/azure-posix.yml
1515
parameters:
1616
job_name: core_tests
17-
image_name: ubuntu-20.04
17+
image_name: ubuntu-24.04
1818
python_versions: ['3.10']
1919
test_suites:
2020
misc_and_scancode: |
@@ -197,8 +197,8 @@ jobs:
197197

198198
- template: etc/ci/azure-posix.yml
199199
parameters:
200-
job_name: ubuntu20_test_all_supported_click_versions
201-
image_name: ubuntu-20.04
200+
job_name: ubuntu22_test_all_supported_click_versions
201+
image_name: ubuntu-22.04
202202
python_versions: ['3.9', '3.10', '3.11', '3.12']
203203
python_architecture: x64
204204
test_suites:
@@ -225,8 +225,8 @@ jobs:
225225

226226
- template: etc/ci/azure-posix.yml
227227
parameters:
228-
job_name: ubuntu20_cpython_latest_from_pip
229-
image_name: ubuntu-20.04
228+
job_name: ubuntu24_cpython_latest_from_pip
229+
image_name: ubuntu-24.04
230230
python_versions: ['3.9', '3.10', '3.11', '3.12']
231231
test_suites:
232232
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
license_expression: proprietary-license
3+
is_license_reference: yes
4+
5+
ignorable_urls:
6+
- https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPProtocol.pdf
7+
---
8+
{{ https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPProtocol.pdf }}
9+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
license_expression: proprietary-license
3+
is_license_reference: yes
4+
ignorable_urls:
5+
- https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPServiceDiscoveryProtocol.pdf
6+
---
7+
{{ https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPServiceDiscoveryProtocol.pdf }}
8+

src/licensedcode/data/rules/cc-by-3.0_and_mit_3.RULE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ ignorable_urls:
88
---
99

1010
## Copyright and license
11-
licensed under a Creative Commons Attribution 3.0 Unported (CC BY 3.0) (https://creativecommons.org/licenses/by/3.0/) and MIT License - https://opensource.org/licenses/mit-license.html.
11+
licensed under a {{Creative Commons Attribution 3.0 Unported}} ({{CC BY 3.0}}) (https://creativecommons.org/licenses/by/3.0/) and {{MIT License}} - {{https://opensource.org/licenses/mit-license.html}}.

src/licensedcode/data/rules/cc-by-sa-4.0_44.RULE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ignorable_urls:
77
---
88

99
This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
10-
{{Creative Commons Attribution-ShareAlike 4.0 International License}}</a>.
10+
{{Creative Commons Attribution-ShareAlike 4.0 International License}}</a>.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
license_expression: chillicream-1.0
3+
is_license_text: yes
4+
minimum_coverage: 90
5+
notes: this was previously the proprietary-license_1023.RULE
6+
---
7+
8+
{{ChilliCream License 1.0}}
9+
10+
This is the license we use for our proprietary software like Banana Cake Pop.
11+
Acceptance
12+
13+
By using the software, you agree to all of the terms and conditions below.
14+
Copyright License
15+
16+
The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below.
17+
Limitations
18+
19+
You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.
20+
21+
You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
22+
Patents
23+
24+
The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
25+
Notices
26+
27+
You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
28+
29+
If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
30+
No Other Rights
31+
32+
These terms do not imply any licenses other than those expressly granted in these terms.
33+
Termination
34+
35+
If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
36+
No Liability
37+
38+
As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
39+
Definitions
40+
41+
The licensor is the entity offering these terms, and the software is the software the licensor makes available under these terms, including any portion of it.
42+
43+
you refers to the individual or entity agreeing to these terms.
44+
45+
your company is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. control means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
46+
47+
your licenses are all the licenses granted to you for the software under these terms.
48+
49+
use means anything you do with the software requiring one of your licenses.
50+
51+
trademark means trademarks, service marks, and similar rights.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
license_expression: chillicream-1.0
3+
is_license_tag: yes
4+
is_continuous: yes
5+
relevance: 100
6+
---
7+
8+
# {{ChilliCream License 1.0}}

0 commit comments

Comments
 (0)