Skip to content

Commit b51c74a

Browse files
pombredannepombredanne
authored
Merge pull request #1307 from furuholm/532-spdx-namespace
Prefix non SPDX licenses "LicenseRef-scancode-"
2 parents adefe29 + ed9f861 commit b51c74a

7 files changed

Lines changed: 43 additions & 44 deletions

File tree

‎src/formattedcode/output_spdx.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,7 @@ def write_spdx(output_file, files, tool_name, tool_version, notice, input_file,
249249
spdx_license = License.from_identifier(spdx_id)
250250
else:
251251
license_key = file_license.get('key')
252-
# FIXME: we should prefix this with ScanCode-
253-
licenseref_id = 'LicenseRef-' + license_key
252+
licenseref_id = 'LicenseRef-scancode-' + license_key
254253
spdx_license = ExtractedLicense(licenseref_id)
255254
spdx_license.name = file_license.get('short_name')
256255
comment = ('See details at https://github.com/nexB/scancode-toolkit'

‎tests/formattedcode/data/spdx/license_ref/expected.rdf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
{
3232
"ns1:ExtractedLicensingInfo": {
3333
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml",
34-
"ns1:licenseId": "LicenseRef-other-copyleft",
34+
"ns1:licenseId": "LicenseRef-scancode-other-copyleft",
3535
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml"
3636
}
3737
},
3838
{
3939
"ns1:ExtractedLicensingInfo": {
4040
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml",
41-
"ns1:licenseId": "LicenseRef-other-permissive",
41+
"ns1:licenseId": "LicenseRef-scancode-other-permissive",
4242
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml"
4343
}
4444
},
4545
{
4646
"ns1:ExtractedLicensingInfo": {
4747
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml",
48-
"ns1:licenseId": "LicenseRef-scancode-acknowledgment",
48+
"ns1:licenseId": "LicenseRef-scancode-scancode-acknowledgment",
4949
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
5050
}
5151
}
@@ -57,21 +57,21 @@
5757
{
5858
"ns1:ExtractedLicensingInfo": {
5959
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml",
60-
"ns1:licenseId": "LicenseRef-other-copyleft",
60+
"ns1:licenseId": "LicenseRef-scancode-other-copyleft",
6161
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml"
6262
}
6363
},
6464
{
6565
"ns1:ExtractedLicensingInfo": {
6666
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml",
67-
"ns1:licenseId": "LicenseRef-other-permissive",
67+
"ns1:licenseId": "LicenseRef-scancode-other-permissive",
6868
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml"
6969
}
7070
},
7171
{
7272
"ns1:ExtractedLicensingInfo": {
7373
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml",
74-
"ns1:licenseId": "LicenseRef-scancode-acknowledgment",
74+
"ns1:licenseId": "LicenseRef-scancode-scancode-acknowledgment",
7575
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
7676
}
7777
}
@@ -99,21 +99,21 @@
9999
{
100100
"ns1:ExtractedLicensingInfo": {
101101
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml",
102-
"ns1:licenseId": "LicenseRef-other-copyleft",
102+
"ns1:licenseId": "LicenseRef-scancode-other-copyleft",
103103
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml"
104104
}
105105
},
106106
{
107107
"ns1:ExtractedLicensingInfo": {
108108
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml",
109-
"ns1:licenseId": "LicenseRef-other-permissive",
109+
"ns1:licenseId": "LicenseRef-scancode-other-permissive",
110110
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml"
111111
}
112112
},
113113
{
114114
"ns1:ExtractedLicensingInfo": {
115115
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml",
116-
"ns1:licenseId": "LicenseRef-scancode-acknowledgment",
116+
"ns1:licenseId": "LicenseRef-scancode-scancode-acknowledgment",
117117
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
118118
}
119119
}

‎tests/formattedcode/data/spdx/license_ref/expected.tv‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ PackageLicenseDeclared: NOASSERTION
1616
PackageLicenseConcluded: NOASSERTION
1717
PackageLicenseInfoFromFiles: Apache-2.0
1818
PackageLicenseInfoFromFiles: CC0-1.0
19-
PackageLicenseInfoFromFiles: LicenseRef-other-copyleft
20-
PackageLicenseInfoFromFiles: LicenseRef-other-permissive
21-
PackageLicenseInfoFromFiles: LicenseRef-scancode-acknowledgment
19+
PackageLicenseInfoFromFiles: LicenseRef-scancode-other-copyleft
20+
PackageLicenseInfoFromFiles: LicenseRef-scancode-other-permissive
21+
PackageLicenseInfoFromFiles: LicenseRef-scancode-scancode-acknowledgment
2222
PackageCopyrightText: <text>Copyright (c) 2017 nexB Inc. and others.
2323
</text>
2424
# File
@@ -27,23 +27,23 @@ FileChecksum: SHA1: f9c28fa2714ad0c2e36d3e5561afb0031fa76831
2727
LicenseConcluded: NOASSERTION
2828
LicenseInfoInFile: Apache-2.0
2929
LicenseInfoInFile: CC0-1.0
30-
LicenseInfoInFile: LicenseRef-other-copyleft
31-
LicenseInfoInFile: LicenseRef-other-permissive
32-
LicenseInfoInFile: LicenseRef-scancode-acknowledgment
30+
LicenseInfoInFile: LicenseRef-scancode-other-copyleft
31+
LicenseInfoInFile: LicenseRef-scancode-other-permissive
32+
LicenseInfoInFile: LicenseRef-scancode-scancode-acknowledgment
3333
FileCopyrightText: <text>Copyright (c) 2017 nexB Inc. and others.
3434
</text>
3535
# Extracted Licenses
36-
LicenseID: LicenseRef-other-copyleft
36+
LicenseID: LicenseRef-scancode-other-copyleft
3737
LicenseComment: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml
3838
</text>
3939
ExtractedText: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml
4040
</text>
41-
LicenseID: LicenseRef-other-permissive
41+
LicenseID: LicenseRef-scancode-other-permissive
4242
LicenseComment: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml
4343
</text>
4444
ExtractedText: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml
4545
</text>
46-
LicenseID: LicenseRef-scancode-acknowledgment
46+
LicenseID: LicenseRef-scancode-scancode-acknowledgment
4747
LicenseComment: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml
4848
</text>
4949
ExtractedText: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml

0 commit comments

Comments
 (0)