Skip to content

Prefix non SPDX licenses "LicenseRef-scancode-" #1307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pombredanne merged 1 commit into from
Dec 10, 2018
Merged

Prefix non SPDX licenses "LicenseRef-scancode-" #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/formattedcode/output_spdx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,7 @@ def write_spdx(output_file, files, tool_name, tool_version, notice, input_file,
spdx_license = License.from_identifier(spdx_id)
else:
license_key = file_license.get('key')
# FIXME: we should prefix this with ScanCode-
licenseref_id = 'LicenseRef-' + license_key
licenseref_id = 'LicenseRef-scancode-' + license_key
spdx_license = ExtractedLicense(licenseref_id)
spdx_license.name = file_license.get('short_name')
comment = ('See details at https://github.com/nexB/scancode-toolkit'
Expand Down
18 changes: 9 additions & 9 deletions tests/formattedcode/data/spdx/license_ref/expected.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml",
"ns1:licenseId": "LicenseRef-other-copyleft",
"ns1:licenseId": "LicenseRef-scancode-other-copyleft",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml"
}
},
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml",
"ns1:licenseId": "LicenseRef-other-permissive",
"ns1:licenseId": "LicenseRef-scancode-other-permissive",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml"
}
},
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml",
"ns1:licenseId": "LicenseRef-scancode-acknowledgment",
"ns1:licenseId": "LicenseRef-scancode-scancode-acknowledgment",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
}
}
Expand All @@ -57,21 +57,21 @@
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml",
"ns1:licenseId": "LicenseRef-other-copyleft",
"ns1:licenseId": "LicenseRef-scancode-other-copyleft",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml"
}
},
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml",
"ns1:licenseId": "LicenseRef-other-permissive",
"ns1:licenseId": "LicenseRef-scancode-other-permissive",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml"
}
},
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml",
"ns1:licenseId": "LicenseRef-scancode-acknowledgment",
"ns1:licenseId": "LicenseRef-scancode-scancode-acknowledgment",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
}
}
Expand Down Expand Up @@ -99,21 +99,21 @@
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml",
"ns1:licenseId": "LicenseRef-other-copyleft",
"ns1:licenseId": "LicenseRef-scancode-other-copyleft",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml"
}
},
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml",
"ns1:licenseId": "LicenseRef-other-permissive",
"ns1:licenseId": "LicenseRef-scancode-other-permissive",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml"
}
},
{
"ns1:ExtractedLicensingInfo": {
"ns1:extractedText": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml",
"ns1:licenseId": "LicenseRef-scancode-acknowledgment",
"ns1:licenseId": "LicenseRef-scancode-scancode-acknowledgment",
"rdfs:comment": "See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml"
}
}
Expand Down
18 changes: 9 additions & 9 deletions tests/formattedcode/data/spdx/license_ref/expected.tv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ PackageLicenseDeclared: NOASSERTION
PackageLicenseConcluded: NOASSERTION
PackageLicenseInfoFromFiles: Apache-2.0
PackageLicenseInfoFromFiles: CC0-1.0
PackageLicenseInfoFromFiles: LicenseRef-other-copyleft
PackageLicenseInfoFromFiles: LicenseRef-other-permissive
PackageLicenseInfoFromFiles: LicenseRef-scancode-acknowledgment
PackageLicenseInfoFromFiles: LicenseRef-scancode-other-copyleft
PackageLicenseInfoFromFiles: LicenseRef-scancode-other-permissive
PackageLicenseInfoFromFiles: LicenseRef-scancode-scancode-acknowledgment
PackageCopyrightText: <text>Copyright (c) 2017 nexB Inc. and others.
</text>
# File
Expand All @@ -27,23 +27,23 @@ FileChecksum: SHA1: f9c28fa2714ad0c2e36d3e5561afb0031fa76831
LicenseConcluded: NOASSERTION
LicenseInfoInFile: Apache-2.0
LicenseInfoInFile: CC0-1.0
LicenseInfoInFile: LicenseRef-other-copyleft
LicenseInfoInFile: LicenseRef-other-permissive
LicenseInfoInFile: LicenseRef-scancode-acknowledgment
LicenseInfoInFile: LicenseRef-scancode-other-copyleft
LicenseInfoInFile: LicenseRef-scancode-other-permissive
LicenseInfoInFile: LicenseRef-scancode-scancode-acknowledgment
FileCopyrightText: <text>Copyright (c) 2017 nexB Inc. and others.
</text>
# Extracted Licenses
LicenseID: LicenseRef-other-copyleft
LicenseID: LicenseRef-scancode-other-copyleft
LicenseComment: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml
</text>
ExtractedText: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-copyleft.yml
</text>
LicenseID: LicenseRef-other-permissive
LicenseID: LicenseRef-scancode-other-permissive
LicenseComment: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml
</text>
ExtractedText: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/other-permissive.yml
</text>
LicenseID: LicenseRef-scancode-acknowledgment
LicenseID: LicenseRef-scancode-scancode-acknowledgment
LicenseComment: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml
</text>
ExtractedText: <text>See details at https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/scancode-acknowledgment.yml
Expand Down
Loading