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

Jump to bottom

570-fix license file generation #617

Merged
merged 4 commits into from
Aug 28, 2024
Merged

570-fix license file generation #617

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
ae25b75
rename not open source license as other
fdiblen Aug 28, 2024
1d08baf
fix license values
fdiblen Aug 28, 2024
89a193a
update the changelog
fdiblen Aug 28, 2024
a43fa76
Merge branch 'main' into 570_license_not_created
fdiblen Aug 28, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* Make online documentation optional [#476](https://github.com/NLeSC/python-template/pull/476)

### Changed
* added value field to license options [#617](https://github.com/NLeSC/python-template/pull/617)
* fix filename typo of githooks [#611](https://github.com/NLeSC/python-template/pull/609)
* next_steps.md is shown as a copier message [#609](https://github.com/NLeSC/python-template/pull/609)
* Change the default profile to 'recommended' [#598](https://github.com/NLeSC/python-template/pull/598)
Expand Down
23 changes: 15 additions & 8 deletions copier/questions/essential.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,18 @@ full_name:
license:
type: str
choices:
- "Apache-2.0"
- "MIT license"
- "BSD license"
- "ISC license"
- "GNU General Public License v3 or later"
- "GNU Lesser General Public License v3 or later"
- "Not open source"
default: "Apache-2.0"
Apache License, Version 2.0:
value: Apachev2
MIT license:
value: MIT
BSD license:
value: BSD
ISC license:
value: ISC
GNU General Public License v3 or later:
value: GNUv3
GNU Lesser General Public License v3 or later:
value: GNULesserv3
Other (add your own license):
value: Other
default: "Apachev2"
0 ...= 'Apache-2.0' %}LICENSE{% endif %}.jinja → ... == 'Apachev2' %}LICENSE{% endif %}.jinja
View file
Open in desktop
File renamed without changes.
0 ... 'BSD license' %}LICENSE{% endif %}.jinja → ...cense == 'BSD' %}LICENSE{% endif %}.jinja
View file
Open in desktop
File renamed without changes.
0 ...e v3 or later' %}LICENSE{% endif %}.jinja → ... 'GNULesserv3' %}LICENSE{% endif %}.jinja
View file
Open in desktop
File renamed without changes.
0 ...e v3 or later' %}LICENSE{% endif %}.jinja → ...nse == 'GNUv3' %}LICENSE{% endif %}.jinja
View file
Open in desktop
File renamed without changes.
0 ... 'ISC license' %}LICENSE{% endif %}.jinja → ...cense == 'ISC' %}LICENSE{% endif %}.jinja
View file
Open in desktop
File renamed without changes.
0 ... 'MIT licence' %}LICENSE{% endif %}.jinja → ...cense == 'MIT' %}LICENSE{% endif %}.jinja
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion template/{% if license == 'Not open source' %}LICENSE{% endif %}.jinja
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions template/{% if license == 'Other' %}LICENSE{% endif %}.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add your own license