Skip to content

Commit 2201bd5

Browse files
authored
Merge pull request #190 from NLeSC/162-use-markdown
Switch to markdown
2 parents d7bcc36 + 6612caf commit 2201bd5

15 files changed

Lines changed: 145 additions & 284 deletions

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,9 @@ docs/apidocs
2020

2121
# Mac
2222
.DS_Store
23+
24+
# virtual environments
25+
env
26+
env3
27+
venv
28+
venv3

.mlc-config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
},
77
{
88
"pattern": "\\{\\{"
9+
},
10+
{
11+
"pattern": "^https://doi.org/<replace-with-created-DOI>"
12+
},
13+
{
14+
"pattern": "^https://bestpractices.coreinfrastructure.org/projects/<replace-with-created-project-identifier>"
915
}
1016
],
1117
"replacementPatterns": [

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at j.vanderzwaan@esciencecenter.nl. All
58+
reported by contacting the project team at XXX@esciencecenter.nl. All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The sections below outline the steps in each case.
3434
1. make sure the existing tests still work by running ``pytest``. If project tests fails use ``pytest --keep-baked-projects`` to keep generated project in /tmp/pytest-* and investigate;
3535
1. add your own tests (if necessary);
3636
1. update or expand the documentation;
37-
1. [push](http://rogerdudler.github.io/git-guide/) your feature branch to (your fork of) the Python Template repository on GitHub;
37+
1. push your feature branch to (your fork of) the Python Template repository on GitHub;
3838
1. create the pull request, e.g. following the instructions [here](https://help.github.com/articles/creating-a-pull-request/).
3939

4040
In case you feel like you've made a valuable contribution, but you don't know how to write or run tests for it, or how to generate the documentation: don't let this discourage you from making the pull request; we can help you! Just go ahead and submit the pull request, but keep in mind that you might be asked to append additional commits to your pull request.

README.dev.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ path/to/package/
1010
├── .gitignore
1111
├── pyproject.toml
1212
├── .prospector.yml
13-
├── CHANGELOG.rst
14-
├── CODE_OF_CONDUCT.rst
15-
├── CONTRIBUTING.rst
13+
├── CHANGELOG.md
14+
├── CODE_OF_CONDUCT.md
15+
├── CONTRIBUTING.md
1616
├── docs
1717
│   ├── conf.py
1818
│   ├── index.rst
@@ -24,8 +24,8 @@ path/to/package/
2424
│   ├── __init__.py
2525
│   ├── __version__.py
2626
│   └── package.py
27-
├── README.rst
28-
├── project_setup.rst
27+
├── README.md
28+
├── project_setup.md
2929
├── requirements.txt
3030
├── setup.cfg
3131
├── setup.py

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ an empty Python package. Features include:
1313
- [Default Github actions]({{cookiecutter.project_name}}/.github/workflows) for building, testing and deployment
1414
- Code style checking,
1515
- [Editorconfig]({{cookiecutter.project_name}}/.editorconfig),
16-
- Miscellaneous files, such as [Change log]({{cookiecutter.project_name}}/CHANGELOG.rst), [Code of Conduct]({{cookiecutter.project_name}}/CODE_OF_CONDUCT.rst), and [Contributing guidelines]({{cookiecutter.project_name}}/CONTRIBUTING.rst),
17-
- A [README]({{cookiecutter.project_name}}/README.rst) and [a separate document]({{cookiecutter.project_name}}/project_setup.md) with extensive documentation about project setup.
16+
- Miscellaneous files, such as [Change log]({{cookiecutter.project_name}}/CHANGELOG.md), [Code of Conduct]({{cookiecutter.project_name}}/CODE_OF_CONDUCT.md), and [Contributing guidelines]({{cookiecutter.project_name}}/CONTRIBUTING.md),
17+
- A [README]({{cookiecutter.project_name}}/README.md) and [a separate document]({{cookiecutter.project_name}}/project_setup.md) with extensive documentation about project setup.
1818
- Continuous code quality and code coverage reporting using [Sonarcloud](https://sonarcloud.io/)
1919

2020
## Badges
@@ -76,10 +76,10 @@ Good job! You have now generated the skeleton for your package:
7676

7777
```text
7878
my-python-project/
79-
├── CHANGELOG.rst
79+
├── CHANGELOG.md
8080
├── CITATION.cff
81-
├── CODE_OF_CONDUCT.rst
82-
├── CONTRIBUTING.rst
81+
├── CODE_OF_CONDUCT.md
82+
├── CONTRIBUTING.md
8383
├── docs
8484
│ ├── conf.py
8585
│ ├── index.rst
@@ -96,7 +96,7 @@ my-python-project/
9696
│ └── __version__.py
9797
├── NOTICE
9898
├── project_setup.md
99-
├── README.rst
99+
├── README.md
100100
├── setup.cfg
101101
├── setup.py
102102
└── tests
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
## [Unreleased]
8+
9+
## [0.0.1] - 1900-12-31
10+
11+
### Added
12+
13+
### Removed
14+
15+
### Changed
16+
17+
[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.0...HEAD
18+
[0.0.1]: https://github.com/olivierlacan/keep-a-changelog/releases/tag/v0.0.1

{{cookiecutter.project_name}}/CHANGELOG.rst

Lines changed: 0 additions & 14 deletions
This file was deleted.

{{cookiecutter.project_name}}/CODE_OF_CONDUCT.rst renamed to {{cookiecutter.project_name}}/CODE_OF_CONDUCT.md

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
###############################################################################
2-
Contributor Covenant Code of Conduct
3-
###############################################################################
1+
# Contributor Covenant Code of Conduct
42

5-
Our Pledge
6-
**********
3+
## Our Pledge
74

85
In the interest of fostering an open and welcoming environment, we as
96
contributors and maintainers pledge to making participation in our project and
@@ -12,8 +9,7 @@ size, disability, ethnicity, gender identity and expression, level of experience
129
education, socio-economic status, nationality, personal appearance, race,
1310
religion, or sexual identity and orientation.
1411

15-
Our Standards
16-
*************
12+
## Our Standards
1713

1814
Examples of behavior that contributes to creating a positive environment
1915
include:
@@ -35,8 +31,7 @@ Examples of unacceptable behavior by participants include:
3531
* Other conduct which could reasonably be considered inappropriate in a
3632
professional setting
3733

38-
Our Responsibilities
39-
********************
34+
## Our Responsibilities
4035

4136
Project maintainers are responsible for clarifying the standards of acceptable
4237
behavior and are expected to take appropriate and fair corrective action in
@@ -48,8 +43,7 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
4843
permanently any contributor for other behaviors that they deem inappropriate,
4944
threatening, offensive, or harmful.
5045

51-
Scope
52-
*****
46+
## Scope
5347

5448
This Code of Conduct applies both within project spaces and in public spaces
5549
when an individual is representing the project or its community. Examples of
@@ -58,8 +52,7 @@ address, posting via an official social media account, or acting as an appointed
5852
representative at an online or offline event. Representation of a project may be
5953
further defined and clarified by project maintainers.
6054

61-
Enforcement
62-
***********
55+
## Enforcement
6356

6457
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6558
reported by contacting the project team at {{ cookiecutter.code_of_conduct_email }}. All
@@ -72,8 +65,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good
7265
faith may face temporary or permanent repercussions as determined by other
7366
members of the project's leadership.
7467

75-
Attribution
76-
***********
68+
## Attribution
7769

78-
This Code of Conduct is adapted from the `Contributor Covenant <https://www.contributor-covenant.org>`_, version 1.4,
70+
This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4,
7971
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Contributing guidelines
2+
3+
We welcome any kind of contribution to our software, from simple comment or question to a full fledged [pull request](https://help.github.com/articles/about-pull-requests/). Please read and follow our [Code of Conduct](CODE_OF_CONDUCT.md).
4+
5+
A contribution can be one of the following cases:
6+
7+
1. you have a question;
8+
1. you think you may have found a bug (including unexpected behavior);
9+
1. you want to make some kind of change to the code base (e.g. to fix a bug, to add a new feature, to update documentation);
10+
1. you want to make a new release of the code base.
11+
12+
The sections below outline the steps in each case.
13+
14+
## You have a question
15+
16+
1. use the search functionality [here]({{cookiecutter.repository}}/issues) to see if someone already filed the same issue;
17+
2. if your issue search did not yield any relevant results, make a new issue;
18+
3. apply the "Question" label; apply other labels when relevant.
19+
20+
## You think you may have found a bug
21+
22+
1. use the search functionality [here]({{cookiecutter.repository}}/issues) to see if someone already filed the same issue;
23+
1. if your issue search did not yield any relevant results, make a new issue, making sure to provide enough information to the rest of the community to understand the cause and context of the problem. Depending on the issue, you may want to include:
24+
- the [SHA hashcode](https://help.github.com/articles/autolinked-references-and-urls/#commit-shas) of the commit that is causing your problem;
25+
- some identifying information (name and version number) for dependencies you're using;
26+
- information about the operating system;
27+
1. apply relevant labels to the newly created issue.
28+
29+
## You want to make some kind of change to the code base
30+
31+
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;
32+
1. (**important**) wait until some kind of consensus is reached about your idea being a good idea;
33+
1. if needed, fork the repository to your own Github profile and create your own feature branch off of the latest master commit. While working on your feature branch, make sure to stay up to date with the master branch by pulling in changes, possibly from the 'upstream' repository (follow the instructions [here](https://help.github.com/articles/configuring-a-remote-for-a-fork/) and [here](https://help.github.com/articles/syncing-a-fork/));
34+
1. make sure the existing tests still work by running ``pytest``;
35+
1. add your own tests (if necessary);
36+
1. update or expand the documentation;
37+
1. update the `CHANGELOG.md` file with change;
38+
1. push your feature branch to (your fork of) the {{ cookiecutter.package_name }} repository on GitHub;
39+
1. create the pull request, e.g. following the instructions [here](https://help.github.com/articles/creating-a-pull-request/).
40+
41+
In case you feel like you've made a valuable contribution, but you don't know how to write or run tests for it, or how to generate the documentation: don't let this discourage you from making the pull request; we can help you! Just go ahead and submit the pull request, but keep in mind that you might be asked to append additional commits to your pull request.

0 commit comments

Comments
 (0)