Skip to content

Commit 1f4195f

Browse files
authored
fix: Don't ask for year, better option order (#175)
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
1 parent e462d87 commit 1f4195f

8 files changed

Lines changed: 13 additions & 13 deletions

File tree

cookiecutter.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"org": "org",
44
"url": "https://github.com/{{ cookiecutter.org }}/{{ cookiecutter.project_name }}",
55
"full_name": "My Name",
6+
"email": "me@email.com",
7+
"project_short_description": "A great package.",
8+
"license": ["BSD", "Apache", "MIT"],
69
"backend": [
710
"hatch",
811
"setuptools",
@@ -17,11 +20,8 @@
1720
"whey",
1821
"maturin"
1922
],
20-
"email": "me@email.com",
21-
"project_short_description": "A great package.",
22-
"year": "{% now 'utc', '%Y' %}",
23-
"license": ["BSD", "Apache", "MIT"],
2423
"_extensions": ["jinja2_time.TimeExtension"],
24+
"__year": "{% now 'utc', '%Y' %}",
2525
"__project_slug": "{{ cookiecutter.project_name | lower | replace('-', '_') | replace('.', '_') }}",
2626
"__type": "{{ 'compiled' if cookiecutter.backend in ['pybind11', 'skbuild', 'mesonpy', 'maturin'] else 'pure' }}"
2727
}

{{cookiecutter.project_name}}/LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{%- if cookiecutter.license == "BSD" %}
22
BSD 3-Clause License
33

4-
Copyright (c) {{ cookiecutter.year }}, {{ cookiecutter.full_name }}.
4+
Copyright (c) {{ cookiecutter.__year }}, {{ cookiecutter.full_name }}.
55
All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without
@@ -218,7 +218,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
218218
same "printed page" as the copyright notice for easier
219219
identification within third-party archives.
220220

221-
Copyright {{ cookiecutter.year }} {{ cookiecutter.full_name }}
221+
Copyright {{ cookiecutter.__year }} {{ cookiecutter.full_name }}
222222

223223
Licensed under the Apache License, Version 2.0 (the "License");
224224
you may not use this file except in compliance with the License.
@@ -232,7 +232,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
232232
See the License for the specific language governing permissions and
233233
limitations under the License.
234234
{%- elif cookiecutter.license == "MIT" %}
235-
Copyright {{ cookiecutter.year }} {{ cookiecutter.full_name }}
235+
Copyright {{ cookiecutter.__year }} {{ cookiecutter.full_name }}
236236

237237
Permission is hereby granted, free of charge, to any person obtaining a copy of
238238
this software and associated documentation files (the "Software"), to deal in

{{cookiecutter.project_name}}/docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# -- Project information -----------------------------------------------------
1313

1414
project = "{{ cookiecutter.project_name }}"
15-
copyright = "{{ cookiecutter.year }}, {{ cookiecutter.full_name }}"
15+
copyright = "{{ cookiecutter.__year }}, {{ cookiecutter.full_name }}"
1616
author = "{{ cookiecutter.full_name }}"
1717

1818

{{cookiecutter.project_name}}/src/{{cookiecutter.__project_slug}}/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) {{ cookiecutter.year }} {{ cookiecutter.full_name }}. All rights reserved.
2+
Copyright (c) {{ cookiecutter.__year }} {{ cookiecutter.full_name }}. All rights reserved.
33
44
{{ cookiecutter.project_name }}: {{ cookiecutter.project_short_description }}
55
"""

{{cookiecutter.project_name}}/src/{{cookiecutter.__project_slug}}/_compat/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) {{ cookiecutter.year }} {{ cookiecutter.full_name }}. All rights reserved.
2+
Copyright (c) {{ cookiecutter.__year }} {{ cookiecutter.full_name }}. All rights reserved.
33
44
{{ cookiecutter.project_name }}: {{ cookiecutter.project_short_description }}
55
"""

{{cookiecutter.project_name}}/src/{{cookiecutter.__project_slug}}/_compat/typing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) {{ cookiecutter.year }} {{ cookiecutter.full_name }}. All rights reserved.
2+
Copyright (c) {{ cookiecutter.__year }} {{ cookiecutter.full_name }}. All rights reserved.
33
44
{{ cookiecutter.project_name }}: {{ cookiecutter.project_short_description }}
55
"""

{{cookiecutter.project_name}}/{% if cookiecutter.backend=='pybind11' %}setup.py{% endif %}

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) {{ cookiecutter.year }}, {{ cookiecutter.full_name }}
1+
# Copyright (c) {{ cookiecutter.__year }}, {{ cookiecutter.full_name }}
22
#
33
# Distributed under the 3-clause BSD license, see accompanying file LICENSE
44
# or {{ cookiecutter.url }} for details.

{{cookiecutter.project_name}}/{% if cookiecutter.backend=='setuptools' %}setup.py{% endif %}

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) {{ cookiecutter.year }}, {{ cookiecutter.full_name }}
1+
# Copyright (c) {{ cookiecutter.__year }}, {{ cookiecutter.full_name }}
22
#
33
# Distributed under the 3-clause BSD license, see accompanying file LICENSE
44
# or {{ cookiecutter.url }} for details.

0 commit comments

Comments
 (0)