Skip to content

Commit a43fa76

Browse files
authored
Merge branch 'main' into 570_license_not_created
2 parents 89a193a + 0d9a3e3 commit a43fa76

4 files changed

Lines changed: 4 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
### Changed
2020
* added value field to license options [#617](https://github.com/NLeSC/python-template/pull/617)
21+
* fix filename typo of githooks [#611](https://github.com/NLeSC/python-template/pull/609)
2122
* next_steps.md is shown as a copier message [#609](https://github.com/NLeSC/python-template/pull/609)
2223
* Change the default profile to 'recommended' [#598](https://github.com/NLeSC/python-template/pull/598)
2324
* Updated the user documentation (README.md) of the template [#569](https://github.com/NLeSC/python-template/pull/569)
@@ -27,7 +28,7 @@
2728
* CHANGELOG.md is now optional ([#462](https://github.com/NLeSC/python-template/issues/462))
2829

2930
### Removed
30-
31+
* Remove the configuration of isort ([#591](https://github.com/NLeSC/python-template/pull/591)), which is no longer used since [#347](https://github.com/NLeSC/python-template/issues/347).
3132

3233
## [0.5.0]
3334

copier/questions/package_details.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ email:
4646
{% endif %}
4747
code_of_conduct_email:
4848
type: str
49-
default: "{{ email }}"
50-
help: What is the email address for code of conduct?
49+
default: "{{ email }}"
50+
help: What is the email address to report code of conduct violations?
5151
when: "{{ template_profile != 'minimum' and AddPackageDetails }}"
5252
validator: >-
5353
{% if not (code_of_conduct_email | regex_search('([A-Za-z0-9]+[.-_])*[A-Za-z0-9]+@[A-Za-z0-9-]+(\.[A-Z|a-z]{2,})+')) %}

template/pyproject.toml.jinja

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@ branch = true
8181
source = ["src/{{ package_name }}"]
8282
command_line = "-m pytest"
8383

84-
[tool.isort]
85-
lines_after_imports = 2
86-
force_single_line = 1
87-
no_lines_before = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
88-
known_first_party = "{{ package_name }}"
89-
src_paths = ["src/{{ package_name }}", "tests"]
90-
line_length = 120
91-
9284
[tool.tox]
9385
legacy_tox_ini = """
9486
[tox]

template/{% if AddPreCommit %}.githhooks{% endif %}/pre-commit renamed to template/{% if AddPreCommit %}.githooks{% endif %}/pre-commit

File renamed without changes.

0 commit comments

Comments
 (0)