Repository navigation
Cut 2.4.2 - #35
Merged
Merged
Cut 2.4.2#35
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Release prep. Everything already merged; this moves
[Unreleased]under a version heading and bumps the version.What 2.4.2 contains
The never-guess promise is ours to keep.
licenses.pypromises that a name identifying a licence family but not a licence is never guessed at.NEVER_RESOLVEheld two entries; "BSD", "Apache", "LGPL", "Public Domain" and the rest were unresolved only because ospac did not happen to carry them. ospac is now filling in folk spellings at our own request, so a release addingbsd -> BSD-3-Clausewould have madenormalize("BSD")answer with a confident wrong identifier. The family names are refused before any lookup now.A refusal survives being put inside an expression. Refusals were matched against the whole string, so
GPLwas refused andGPL/MITreturnedGPL-1.0-or-later AND MIT— the exact wrong answer the refusal exists to prevent, in the spelling SBOMs most often use for dual licensing.(GPL)did it with one token. An adopter's ownnever_resolvewas bypassable the same way.Precedence is decided in one place. Adopter
never_resolve→ adopter aliases → our refusals → everything else, applied in both key spaces. Overrides were previously implemented by subtracting names from the refusal list, which put them after the SPDX parser and in one key space only: an overlay mappinggplgot the parser's deprecatedGPL-1.0-or-laterinstead of the identifier they chose, and the same name answered two ways depending on a leading "The".One rule where there were two. An explicit statement by the adopter now beats every refusal this tool would make — the ambiguity report used to be an exception. Their
never_resolvestill beats their own alias, being more specific.Patch
No new surface. Nothing that names a licence stops resolving:
MIT License,ISC License,Apache License 2.0,EPL-2.0,MIT AND Apache-2.0,Apache-2.0 WITH LLVM-exceptionall unchanged. None of the newly refused names ever resolved.Also here
A test asserted which lookup path resolved a real licence, which is ospac's data to decide. ospac 1.7.0 moved one spelling between paths and
mainwent red on a release nobody here made; it asserts the mechanism now.Checks
pyproject.toml,src/ossbomer/__init__.pyand the compare link all at 2.4.2python -m buildproduces both artifacts;twine checkpasses on eachTagging
v2.4.2once this lands, which triggers the PyPI publish.