Skip to content

Commit 6cad137

Browse files
committed
Merge branch 'main' into 615_pyproject_python_version
2 parents e1ce2d9 + ff74544 commit 6cad137

File tree

57 files changed

+426
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+426
-342
lines changed

.github/ISSUE_TEMPLATE/01_bug_report.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: ''
5-
labels: 'bug'
5+
labels: bug
66
assignees: ''
77

88
---
@@ -44,9 +44,7 @@ If applicable, add screenshots to help explain your problem.
4444
- [ ] minimum
4545
- [ ] let me choose
4646
- OS:
47-
<!-- run this command: uname -a -->
4847
- version:
49-
<!-- run this command: python -c "import kunefe; print(kunefe.__version__)" -->
5048

5149
**Additional context**
5250

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
1919
python-version: ['3.10', '3.11', '3.12']
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v5
23+
uses: actions/setup-python@v6
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Python info

.github/workflows/cffconvert.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out a copy of the repository
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Check whether the citation metadata from CITATION.cff is valid
1717
uses: citation-file-format/[email protected]

.github/workflows/link-check.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ name: link-check
22

33
on:
44
workflow_dispatch:
5-
push:
6-
branches:
7-
- main
8-
pull_request:
9-
branches:
10-
- main
115
schedule:
126
- cron: '0 0 1 * *' # first day of every month at midnight
137

@@ -19,11 +13,11 @@ jobs:
1913
linkChecker:
2014
runs-on: ubuntu-latest
2115
steps:
22-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
2317

2418
- name: Link Checker
2519
id: lychee
26-
uses: lycheeverse/lychee-action@v1
20+
uses: lycheeverse/lychee-action@v2
2721

2822
- name: Set Issue Title
2923
id: set_title

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
1919
python-version: ['3.10', '3.11', '3.12']
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v5
23+
uses: actions/setup-python@v6
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Python info

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@ env
2626
env3
2727
venv
2828
venv3
29+
.venv
30+
.venv3
2931

3032
.swp

CHANGELOG.md

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,32 @@
33
## [Unreleased]
44

55
### Added
6+
7+
### Changed
8+
9+
### Removed
10+
11+
## 0.6.1
12+
13+
### Added
14+
15+
* Add .gitignore and .editorconfig to the list of files that are not updated if they exist [#655](https://github.com/NLeSC/python-template/pull/655)
16+
17+
### Changed
18+
19+
* copyright owner is asked in all profiles [#629](https://github.com/NLeSC/python-template/pull/629)
20+
* license files includes year and copyright owner information [#629](https://github.com/NLeSC/python-template/pull/629)
21+
* combine all the next step jobs in a single workflow [#657](https://github.com/NLeSC/python-template/pull/657)
22+
* fix CITATION.cff validation issues which also helps cffconvert workflow to pass [#657](https://github.com/NLeSC/python-template/pull/657)
23+
24+
### Removed
25+
26+
* Remove pyproject.toml and CITATION.cff from the list of files that are not updated if they exist [#655](https://github.com/NLeSC/python-template/pull/655)
27+
28+
## [0.6.0]
29+
30+
### Added
31+
632
* Keep project_setup.md for all the profiles and remove from the menu [#576](https://github.com/NLeSC/python-template/pull/576)
733
* Make contributing guidelines optional [#465](https://github.com/NLeSC/python-template/pull/465)
834
* Make linting optional [#568](https://github.com/NLeSC/python-template/pull/568)
@@ -15,8 +41,12 @@
1541
* Make SonarCloud optional [#515](https://github.com/NLeSC/python-template/pull/515)
1642
* Make citation optional [#471](https://github.com/NLeSC/python-template/pull/471)
1743
* Make online documentation optional [#476](https://github.com/NLeSC/python-template/pull/476)
44+
* Make local documentation optional [#593](https://github.com/NLeSC/python-template/pull/593)
45+
* Make local test optional [#594](https://github.com/NLeSC/python-template/pull/594)
1846

1947
### Changed
48+
49+
* Update the user documentation (README.md) of the template [#575](https://github.com/NLeSC/python-template/pull/623)
2050
* Updated .gitignore [#622](https://github.com/NLeSC/python-template/pull/622)
2151
* add extra info for sub-menus [#628](https://github.com/NLeSC/python-template/pull/628)
2252
* skip merging CHANGELOG.md and CODE_OF_CONDUCT.md if they exist [#628](https://github.com/NLeSC/python-template/pull/628)
@@ -29,8 +59,10 @@
2959
* Fix broken link checker [#546](https://github.com/NLeSC/python-template/pull/546)
3060
* pre-commit script is optional ([#457](https://github.com/NLeSC/python-template/issues/457))
3161
* CHANGELOG.md is now optional ([#462](https://github.com/NLeSC/python-template/issues/462))
62+
* Restored default line-length of 79 characters, as recommended by [PEP-8](https://peps.python.org/pep-0008/#maximum-line-length) [#389](https://github.com/NLeSC/python-template/pull/389)
3263

3364
### Removed
65+
3466
* 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).
3567

3668
## [0.5.0]
@@ -148,7 +180,6 @@ Released on Apr 22, 2021
148180
* Drop Python 3.5 support
149181
* Removed unit tests doing the linting
150182

151-
152183
## [0.2.0]
153184

154185
Released on July 17, 2019
@@ -174,14 +205,14 @@ Released on July 17, 2019
174205
* Fix example tests that failed to run (#28)
175206
* Remove quotes from project name and project description (#27)
176207
* Update prospector configuration (#26)
177-
- Make prospector less strict
178-
- Have prospector ignore the docs directory
208+
* Make prospector less strict
209+
* Have prospector ignore the docs directory
179210
* Add `install_requires` to `setup.py` (#21)
180211
* Improved .gitignore (#22)
181212
* More detailed documentation about
182-
- Project setup
183-
- Setup instructions
184-
- NOTICE file
213+
* Project setup
214+
* Setup instructions
215+
* NOTICE file
185216

186217
### Removed
187218

@@ -194,20 +225,19 @@ Released on July 12, 2018.
194225
### Added
195226

196227
* First version of the Python project template that follows the Netherlands eScience Center software development guide, containing:
197-
- Tests,
198-
- Documentation,
199-
- Code style checking
200-
- Editorconfig
201-
- Default Travis configuration
202-
- Change log
203-
- Code of Conduct
204-
- Contributing guidelines
205-
- License
206-
- Manifest.in
207-
- README
208-
- Requirements.txt
209-
- Setup configuration
210-
228+
* Tests,
229+
* Documentation,
230+
* Code style checking
231+
* Editorconfig
232+
* Default Travis configuration
233+
* Change log
234+
* Code of Conduct
235+
* Contributing guidelines
236+
* License
237+
* Manifest.in
238+
* README
239+
* Requirements.txt
240+
* Setup configuration
211241

212242
[Unreleased]: https://github.com/NLeSC/python-template//compare/0.5.0...HEAD
213243
[0.5.0]: https://github.com/NLeSC/python-template/releases/tag/0.5.0

CITATION.cff

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,22 @@ authors:
6868
family-names: Tjong Kim Sang
6969
given-names: Erik
7070
orcid: "https://orcid.org/0000-0002-8431-081X"
71+
- given-names: Abel
72+
family-names: Soares Siqueira
73+
74+
affiliation: Netherlands eScience Center
75+
orcid: "https://orcid.org/0000-0003-4451-281X"
76+
- given-names: Olga
77+
family-names: Lyashevska
78+
79+
affiliation: Netherlands eScience Center
80+
orcid: 'https://orcid.org/0000-0002-8686-8550'
81+
- given-names: Sander
82+
name-particle: van
83+
family-names: Rijn
84+
85+
affiliation: Netherlands eScience Center
86+
orcid: 'https://orcid.org/0000-0001-6159-041X'
7187
cff-version: "1.2.0"
7288
date-released: 2018-07-17
7389
doi: 10.5281/zenodo.1310751
@@ -79,4 +95,4 @@ license: Apache-2.0
7995
message: "If you use this software, please cite it using these metadata."
8096
repository-code: "https://github.com/NLeSC/python-template"
8197
title: "Netherlands eScience Center Python Template"
82-
version: "0.4.0"
98+
version: "0.6.1"

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The sections below outline the steps in each case.
2727

2828
## You want to make some kind of change to the code base
2929

30-
1. (**important**) this repository implements the best practices we recommend in the Python chapter of the [Guide](https://guide.esciencecenter.nl/#/best_practices/language_guides/python). Check that your planned contribution is
30+
1. (**important**) this repository implements the best practices we recommend in the Python chapter of the [Guide](https://guide.esciencecenter.nl/#/language_guides/python). Check that your planned contribution is
3131
in line with what is recommended there. If not, please [contribute to the guide](https://github.com/NLeSC/guide/blob/main/CONTRIBUTING.md) instead / as well, or at least create an issue there.
3232
1. (**important**) announce your plan to the rest of the community _before you start working_. This announcement should be in the form of a (new) issue;
3333
1. (**important**) wait until some kind of consensus is reached about your idea being a good idea;
@@ -54,4 +54,4 @@ To create a release you need write permission on the repository.
5454
1. Fill version, title and description field
5555
1. Press the Publish Release button
5656

57-
Also a Zenodo entry will be made for the release with its own DOI.
57+
Also a Zenodo entry will be made for the release with its own DOI.

README.md

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,28 @@
11
# Netherlands eScience Center Python Template
22

3-
Spend less time setting up and configuring your new Python packages which includes research software good practices from the start.
3+
<img align="right" width="160" src="logo.png" alt='Python Template logo, created using ChatGPT 4o on 10 September 2024 using prompt "generate a logo of a copier that looks like a snake-scientist"'>
44

5-
Use this [Copier](https://copier.readthedocs.io) template to generate an empty Python package. Features include:
5+
Spend less time setting up and configuring your new Python packages by using this template. This [Copier](https://copier.readthedocs.io) template includes best practices for research software so your new package will include these practices from the start.
6+
7+
You can choose from various user profiles, each offering a range of features to suit your needs.
8+
9+
## User profiles
10+
11+
The template profiles for a Python package offer varying levels of customization to cater to different user needs. Below are the profiles the template offers.
12+
13+
### Minimum
14+
15+
This profile offers the essential features to begin developing a Python package, making it ideal for first-time research software developers. Additional features can be added as needed.
16+
17+
### Recommended
18+
19+
This option provides a pre-selected set of features for research software, which users can fully customize.
20+
21+
### Let me choose
22+
23+
This fully customizable profile enables you to selectively include or exclude features in your Python package.
24+
25+
## Features
626

727
- Boilerplate unit tests and documentation,
828
- [Python static setup configuration](template/pyproject.toml.jinja),
@@ -14,7 +34,7 @@ Use this [Copier](https://copier.readthedocs.io) template to generate an empty P
1434
- [README.md](template/README.md.jinja) for package users,
1535
- [README.dev.md](template/README.dev.md.jinja) for package developer,
1636
- [project_setup.md](template/project_setup.md.jinja) with extensive documentation about project setup,
17-
- [Change log](template/%7B%25%20if%20AddChangeLog%20%25%7DCHANGELOG.md%7B%25%20endif%20%25%7D),
37+
- [Changelog](template/%7B%25%20if%20AddChangeLog%20%25%7DCHANGELOG.md%7B%25%20endif%20%25%7D),
1838
- [Code of Conduct](template/CODE_OF_CONDUCT.md.jinja),
1939
- [Contributing guidelines](template/CONTRIBUTING.md.jinja),
2040
- Continuous code quality and code coverage reporting using [Sonarcloud](https://sonarcloud.io/),

0 commit comments

Comments
 (0)