Skip to content
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

Support simple SPDX license expressions (PEP 639) #712

Merged
merged 8 commits into from
Feb 8, 2025
Merged

Support simple SPDX license expressions (PEP 639) #712

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
640b6ad
Add support for license expressions
cdce8p Nov 24, 2024
6d60848
Add validation of simple license expressions
takluyver Jan 20, 2025
06faa0b
Allow unrecognised license IDs with FLIT_ALLOW_INVALID
takluyver Jan 20, 2025
c62ba7d
Fix path passed to read_pep621_metadata in test
takluyver Feb 7, 2025
e08f30f
Fix the path passed to read_pep621_metadata in more tests
takluyver Feb 7, 2025
f08bb9f
Merge branch 'main' into license-expression
takluyver Feb 8, 2025
345bf1c
Remove test for license text again
takluyver Feb 8, 2025
0d0d06b
Add back project.license.file to license files
takluyver Feb 8, 2025
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
Prev Previous commit
Next Next commit
Allow unrecognised license IDs with FLIT_ALLOW_INVALID
  • Loading branch information
@takluyver
takluyver committed Jan 20, 2025
commit 06faa0bfdaa2a24e52b28efa4ce62eb2ae8b8d17
4 changes: 4 additions & 0 deletions flit_core/flit_core/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,10 @@
try:
info = licenses[ls]
except KeyError:
if os.environ.get('FLIT_ALLOW_INVALID'):
log.warning("Invalid license ID {!r} allowed by FLIT_ALLOW_INVALID"

Check warning on line 769 in flit_core/flit_core/config.py

View check run for this annotation

Codecov / codecov/patch

flit_core/flit_core/config.py#L769 

Added line #L769 was not covered by tests
.format(s))
return s

Check warning on line 771 in flit_core/flit_core/config.py

View check run for this annotation

Codecov / codecov/patch

flit_core/flit_core/config.py#L771 

Added line #L771 was not covered by tests
raise ConfigError(f"{s!r} is not a recognised SPDX license ID")

return info['id'] + ('+' if or_later else '')
Loading