Skip to content

Commit 9961328

Browse files
committed
style: apply patch to conform to upstream style
1 parent 42e87d0 commit 9961328

File tree

3 files changed

+45
-49
lines changed

3 files changed

+45
-49
lines changed

.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,17 @@
8383
"default",
8484
"_envops",
8585
"_subdirectory",
86+
"_message_before_copy",
87+
"_message_after_copy",
88+
"_message_before_update",
89+
"_message_after_update",
8690
"project_name",
8791
"project_description",
92+
"copyright_license",
93+
"copyright_year",
8894
"author_name",
8995
"organization_name",
96+
"copyright_holder",
9097
"author_email",
9198
"repo_host_type",
9299
"repo_host",

copier.yaml

Lines changed: 31 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,58 @@ _envops:
33
block_start_string: '[%'
44
_subdirectory: template
55
_message_before_copy: |
6-
Thanks for generating a project using our template.
6+
Thanks for generating a project using our template.
77
8-
You'll be asked a series of questions whose answers will be used to
9-
generate a tailored project for you.
8+
You'll be asked a series of questions whose answers will be used to
9+
generate a tailored project for you.
1010
_message_after_copy: |
11-
Your project "{{ project_name }}" has been created successfully!
11+
Your project "{{ project_name }}" has been created successfully!
1212
_message_before_update: |
13-
Thanks for updating your project using our template.
13+
Thanks for updating your project using our template.
1414
15-
You'll be asked a series of questions whose answers are pre-populated
16-
with previously entered values. Feel free to change them as needed.
15+
You'll be asked a series of questions whose answers are pre-populated
16+
with previously entered values. Feel free to change them as needed.
1717
_message_after_update: |
18-
Your project "{{ project_name }}" has been updated successfully!
19-
In case there are any conflicts, please resolve them. Then,
20-
you're done.
21-
18+
Your project "{{ project_name }}" has been updated successfully!
19+
In case there are any conflicts, please resolve them. Then,
20+
you're done.
2221
project_name:
2322
default: Serious Scaffold Python
2423
help: 'Enter the name of the project in CamelCase format:'
2524
type: str
26-
2725
project_description:
2826
default: A development-focused Python project template with various integrations, configurations and modules.
2927
help: 'Provide a brief description for the project:'
3028
type: str
31-
29+
copyright_license:
30+
default: MIT License
31+
choices:
32+
- Apache Software License
33+
- Boost Software License 1.0 (BSL-1.0)
34+
- GNU Affero General Public License v3
35+
- GNU General Public License v3 (GPLv3)
36+
- GNU Lesser General Public License v3 (LGPLv3)
37+
- MIT License
38+
- Mozilla Public License 2.0 (MPL 2.0)
39+
- The Unlicense (Unlicense)
40+
help: Choose the project's license (e.g. "MIT", "GPL-3.0").
41+
type: str
42+
copyright_year:
43+
default: 2022-{{ "%Y" | strftime }}
44+
help: Enter the copyright year or range (e.g. "2022-2023").
45+
type: str
3246
author_name:
3347
default: huxuan
3448
help: 'Specify the name of the author:'
3549
type: str
36-
3750
organization_name:
3851
default: Serious Scaffold
3952
help: 'Provide the name of the organization associated with the project:'
4053
type: str
41-
54+
copyright_holder:
55+
default: '{{ organization_name }}'
56+
help: Name(s) or organization(s) holding the copyright.
57+
type: str
4258
author_email:
4359
default: |-
4460
[% if author_name == 'huxuan' and organization_name == 'Serious Scaffold' -%]
@@ -48,7 +64,6 @@ author_email:
4864
[%- endif %]
4965
help: 'Specify the email address of the author:'
5066
type: str
51-
5267
repo_host_type:
5368
default: github.com
5469
choices:
@@ -57,13 +72,11 @@ repo_host_type:
5772
GitLab (self-managed): gitlab-self-managed
5873
help: 'Choose the host for the repository:'
5974
type: str
60-
6175
repo_host:
6276
default: '{{ repo_host_type }}'
6377
help: 'Specify the host of the self-managed GitLab:'
6478
type: str
6579
when: '{{ repo_host_type == "gitlab-self-managed" }}'
66-
6780
page_host:
6881
default: |-
6982
[% if repo_host_type == 'github.com' -%]
@@ -74,27 +87,22 @@ page_host:
7487
help: 'Specify the host of the self-managed GitLab Pages:'
7588
type: str
7689
when: '{{ repo_host_type == "gitlab-self-managed" }}'
77-
7890
repo_namespace:
7991
default: '{{ organization_name|lower|replace(" ", "-") }}'
8092
help: 'Indicate the GitHub Repository Owner or GitLab Namespace. This is typically the account name of the author or the organization:'
8193
type: str
82-
8394
repo_name:
8495
default: '{{ project_name|lower|replace(" ", "-") }}'
8596
help: 'Provide a name for the repository:'
8697
type: str
87-
8898
package_name:
8999
default: '{{ repo_name|regex_replace("-python$", "") }}'
90100
help: 'Specify the name of the distributable package for the project (often used in "pip install <package_name>"):'
91101
type: str
92-
93102
module_name:
94103
default: '{{ package_name|lower|replace("-", "_") }}'
95104
help: 'Specify the name of the primary module within the package (often used in "import <module_name>"):'
96105
type: str
97-
98106
coverage_threshold:
99107
default: 100
100108
help: 'Set the threshold for test coverage, ranging from 0 to 100:'
@@ -109,7 +117,6 @@ min_py:
109117
- '3.11'
110118
help: 'Choose the minimal Python version the project should support:'
111119
type: str
112-
113120
max_py:
114121
default: '3.11'
115122
choices:
@@ -126,7 +133,6 @@ max_py:
126133
value: '3.11'
127134
help: 'Choose the maximal Python version the project should support:'
128135
type: str
129-
130136
default_py:
131137
default: '{{ max_py }}'
132138
choices:
@@ -144,27 +150,3 @@ default_py:
144150
value: '3.11'
145151
help: 'Choose the default Python version for development, documentation generation, and package build:'
146152
type: str
147-
148-
copyright_license:
149-
type: str
150-
help: Choose the project's license (e.g. "MIT", "GPL-3.0").
151-
default: MIT License
152-
choices:
153-
- Apache Software License
154-
- Boost Software License 1.0 (BSL-1.0)
155-
- GNU Affero General Public License v3
156-
- GNU General Public License v3 (GPLv3)
157-
- GNU Lesser General Public License v3 (LGPLv3)
158-
- MIT License
159-
- Mozilla Public License 2.0 (MPL 2.0)
160-
- The Unlicense (Unlicense)
161-
162-
copyright_year:
163-
type: str
164-
help: Enter the copyright year or range (e.g. "2022-2023").
165-
default: '2022-{{ "%Y" | strftime }}'
166-
167-
copyright_holder:
168-
type: str
169-
help: Name(s) or organization(s) holding the copyright.
170-
default: '{{ organization_name }}'

template/.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,17 @@
8383
"default",
8484
"_envops",
8585
"_subdirectory",
86+
"_message_before_copy",
87+
"_message_after_copy",
88+
"_message_before_update",
89+
"_message_after_update",
8690
"project_name",
8791
"project_description",
92+
"copyright_license",
93+
"copyright_year",
8894
"author_name",
8995
"organization_name",
96+
"copyright_holder",
9097
"author_email",
9198
"repo_host_type",
9299
"repo_host",

0 commit comments

Comments
 (0)