Skip to content

SPDX integration #440

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

Closed
DorsalGreen wants to merge 4 commits into from
Closed

SPDX integration #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63f72f4
Added SPDX license identifier list to licenses.py
DorsalGreen Aug 22, 2020
33aba81
Added support for SPDX license identifier list
DorsalGreen Aug 22, 2020
a2f6d16
Updated template to consolidate based on SPDX license key.
DorsalGreen Aug 22, 2020
392440c
Fix bug in generation of license_key
DorsalGreen Aug 22, 2020
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
4 changes: 3 additions & 1 deletion src/attributecode/attrib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from attributecode import ERROR
from attributecode import Error
from attributecode.licenses import COMMON_LICENSES
from attributecode.licenses import COMMON_SPDX_LICENSES
from attributecode.model import parse_license_expression
from attributecode.util import add_unc
from attributecode.attrib_util import multi_sort
Expand Down Expand Up @@ -79,7 +80,7 @@ def generate(abouts, template=None, variables=None):
if not license_text_name in captured_license:
captured_license.append(license_text_name)
if license_text_name.endswith('.LICENSE'):
license_key = license_text_name.strip('.LICENSE')
license_key = license_text_name.rsplit('.', 1)[0]
else:
license_key = license_text_name
license_key_and_context[license_key] = about.license_file.value[license_text_name]
Expand Down Expand Up @@ -120,6 +121,7 @@ def generate(abouts, template=None, variables=None):
utcnow = datetime.datetime.utcnow()
rendered = template.render(
abouts=abouts, common_licenses=COMMON_LICENSES,
common_spdx_licenses=COMMON_SPDX_LICENSES,
license_key_and_context=sorted_license_key_and_context,
license_file_name_and_key=license_file_name_and_key,
license_key_to_license_name=license_key_to_license_name,
Expand Down
Loading