From 7f2a53facce9998c3304f82cfccd53714062f204 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 15:45:13 +0200 Subject: [PATCH 1/5] mention the next screen for GitHub Actions --- copier/questions/features_code_quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copier/questions/features_code_quality.yml b/copier/questions/features_code_quality.yml index b1b6bef7..ea29397f 100644 --- a/copier/questions/features_code_quality.yml +++ b/copier/questions/features_code_quality.yml @@ -14,7 +14,7 @@ SelectCodeQualityFeatures: help: Select code quality features multiselect: true choices: - GitHub Actions: + GitHub Actions (selection on the next menu): value: SelectGitHubActions_flag # validator: "{% if something != 'AnotherThing' %}BlaBla{% endif %}" Linting: From 1a57008ac404b217090ee33bb9f02b51794c9273 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 15:45:49 +0200 Subject: [PATCH 2/5] mention the next screen for citation --- copier/questions/features_publish_release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/copier/questions/features_publish_release.yml b/copier/questions/features_publish_release.yml index 8f1d027a..3a4bd5a8 100644 --- a/copier/questions/features_publish_release.yml +++ b/copier/questions/features_publish_release.yml @@ -14,7 +14,7 @@ SelectPublishReleaseFeatures: help: Select publish and release features multiselect: true choices: - Citation: + Citation (selection on the next menu): value: SelectCitation_flag # validator: "{% if something != 'AnotherThing' %}BlaBla{% endif %}" Changelog: @@ -55,17 +55,14 @@ AddCitation: type: bool default: "{{ 'AddCitationFile_flag' in SelectCitation }}" when: false - AddCFFConvert: type: bool default: "{{ 'AddCFFConvert_flag' in SelectCitation }}" when: false - AddChangeLog: type: bool default: "{{ 'AddChangeLog_flag' in SelectPublishReleaseFeatures }}" when: false - AddZenodo: type: bool default: "{{ 'AddZenodo_flag' in SelectPublishReleaseFeatures }}" From 8d33ddb9409b15ecdc166ce341316d265a780e8c Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 15:47:05 +0200 Subject: [PATCH 3/5] skip merging CHANGELOG.md and CODE_OF_CONDUCT.md if they exist --- copier/settings.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/copier/settings.yml b/copier/settings.yml index 5457c2a9..cd2071bd 100644 --- a/copier/settings.yml +++ b/copier/settings.yml @@ -6,3 +6,5 @@ _skip_if_exists: - "pyproject.toml" - CITATION.cff - LICENSE + - CHANGELOG.md + - CODE_OF_CONDUCT.md From c3ffd45fac64db009ae64a45a310d8083b661ae7 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 15:47:39 +0200 Subject: [PATCH 4/5] remove the whitespace from yaml files --- copier/questions/features_community.yml | 1 - copier/questions/features_documentation.yml | 1 - copier/questions/package_details.yml | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/copier/questions/features_community.yml b/copier/questions/features_community.yml index 802c8daa..60ffb645 100644 --- a/copier/questions/features_community.yml +++ b/copier/questions/features_community.yml @@ -26,7 +26,6 @@ AddCodeConduct: type: bool default: "{{ 'AddCodeConduct_flag' in SelectCommunityFeatures }}" when: false - AddContributing: type: bool default: "{{ 'AddContributing_flag' in SelectCommunityFeatures }}" diff --git a/copier/questions/features_documentation.yml b/copier/questions/features_documentation.yml index ab16d8f6..3e025607 100644 --- a/copier/questions/features_documentation.yml +++ b/copier/questions/features_documentation.yml @@ -26,7 +26,6 @@ AddOnlineDocumentation: type: bool default: "{{ 'AddOnlineDocumentation_flag' in SelectDocumentationFeatures }}" when: false - AddDevDoc: type: bool default: "{{ 'AddDevDoc_flag' in SelectDocumentationFeatures }}" diff --git a/copier/questions/package_details.yml b/copier/questions/package_details.yml index 79fdb68d..06f49004 100644 --- a/copier/questions/package_details.yml +++ b/copier/questions/package_details.yml @@ -59,11 +59,10 @@ copyright_holder: help: Who is the copyright holder? when: "{{ template_profile != 'minimum' and AddPackageDetails }}" -# calculated fields for GitHub +# computed fields for GitHub repository: default: git@github.com:{{ github_organization }}/{{ package_name }} when: false - repository_url: default: https://github.com/{{ github_organization }}/{{ package_name }} when: false From 1ac5d793014b06307c15c20c1be331dc304a1104 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 28 Aug 2024 15:50:03 +0200 Subject: [PATCH 5/5] update the changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd611f86..736b7656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ * Make online documentation optional [#476](https://github.com/NLeSC/python-template/pull/476) ### Changed +* add extra info for sub-menus [#628](https://github.com/NLeSC/python-template/pull/628) +* skip merging CHANGELOG.md and CODE_OF_CONDUCT.md if they exist [#628](https://github.com/NLeSC/python-template/pull/628) * 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)