Skip to content

Align license terminology with SPDX License List#191

Merged
freakboy3742 merged 3 commits intobeeware:mainfrom
NMertsch:2270-improve-license-selection-wording
May 4, 2025
Merged

Align license terminology with SPDX License List#191
freakboy3742 merged 3 commits intobeeware:mainfrom
NMertsch:2270-improve-license-selection-wording

Conversation

@NMertsch
Copy link
Copy Markdown
Contributor

@NMertsch NMertsch commented Apr 30, 2025

Summary

Align license names with the SPDX License List.

Fixes beeware/briefcase#2270
Accompanies beeware/briefcase#2272

Please see beeware/briefcase#2272 for a longer description.

briefcase-repo: https://github.com/NMertsch/briefcase
briefcase-ref: 2270-improve-license-selection-wording

PR Checklist:

  • All new features have been tested
  • All new features have been documented
  • I have read the CONTRIBUTING.md file
  • I will abide by the code of conduct

Copy link
Copy Markdown
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An idle thought - given that the SPDX names are actually identifiers, it might be better to use them as identifiers - that is, in this template, use the SPDX identifier as the thing that is selected, and then in Briefcase, use SPDX: full name as a key-value pair.

It's not essential that the name in the template be human readable, as it won't be exposed to the user under normal circumstances; and an SPDX identifier will be a lot less ambiguous than a matching a human-readable name in the template logic itself.

@NMertsch
Copy link
Copy Markdown
Contributor Author

NMertsch commented May 1, 2025

it might be better to use them as identifiers

@freakboy3742 good idea, done in e10382d.

@NMertsch
Copy link
Copy Markdown
Contributor Author

NMertsch commented May 1, 2025

@freakboy3742 Is any testing or documentation work expected for this PR? I assume that's all done in beeware/briefcase#2272.

@NMertsch NMertsch marked this pull request as ready for review May 1, 2025 22:30
@freakboy3742
Copy link
Copy Markdown
Member

@freakboy3742 Is any testing or documentation work expected for this PR? I assume that's all done in beeware/briefcase#2272.

There's a sort of mutual testing that goes on. The template is tested - essentially we use the current "main" briefcase, pointed at this template, to verify that we can still generate a viable app; and then on the other side, Briefcase runs tests with the current "main" template.

If you end up in a situation where the template needs an in-development version of Briefcase to pass, you can put:

briefcase-repo: https://github.com/my-username/briefcase
briefcase-ref: my-branch-name

into the body of the template PR, and the test run will use the specified in-development version of Briefcase. When it comes time to merge, we'll merge the template, re-run CI on Briefcase, and then merge briefcase - usually in very rapid succession, to minimise the inconvenience.

However, before it even gets to those tests, there's a pre-commit issue to resolve :-)

Copy link
Copy Markdown
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me; I'll hold off merging until the matching Briefcase PR is ready to land.

@freakboy3742 freakboy3742 merged commit 4348ebc into beeware:main May 4, 2025
28 of 52 checks passed
@freakboy3742
Copy link
Copy Markdown
Member

beeware/briefcase#2272 has now been finalised, so we can land this. Thanks for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

License selection mentions ambiguous "BSD license"

2 participants