Skip to content

Commit c65bf6c

Browse files
authored
Merge pull request #29 from nf-core/dev
Dev > Master for v1.0.0 release
2 parents d5db29c + b17c935 commit c65bf6c

34 files changed

+540
-733
lines changed

.github/CONTRIBUTING.md

100755100644
Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# nf-core/atacseq Contributing Guidelines
1+
# nf-core/atacseq: Contributing Guidelines
22

33
Hi there! Many thanks for taking an interest in improving nf-core/atacseq.
44

5-
We try to manage the required tasks for nf-core/atacseq using GitHub issues, you probably came to this page when creating one. Please use the prefilled template to save time.
5+
We try to manage the required tasks for nf-core/atacseq using GitHub issues, you probably came to this page when creating one. Please use the pre-filled template to save time.
66

77
However, don't be put off by this template - other more general issues and suggestions are welcome! Contributions to the code are even more welcome ;)
88

9-
> If you need help using nf-core/atacseq then the best place to go is the Gitter chatroom where you can ask us questions directly: https://gitter.im/nf-core/Lobby
9+
> If you need help using or modifying nf-core/atacseq then the best place to ask is the nf-core `atacseq` channel on [Slack](https://nf-core-invite.herokuapp.com/).
1010
1111
## Contribution workflow
1212
If you'd like to write some code for nf-core/atacseq, the standard workflow
@@ -15,11 +15,31 @@ is as follows:
1515
1. Check that there isn't already an issue about your idea in the
1616
[nf-core/atacseq issues](https://github.com/nf-core/atacseq/issues) to avoid
1717
duplicating work.
18-
* Feel free to add a new issue here for the same reason.
18+
* If there isn't one already, please create one so that others know you're working on this
1919
2. Fork the [nf-core/atacseq repository](https://github.com/nf-core/atacseq) to your GitHub account
2020
3. Make the necessary changes / additions within your forked repository
21-
4. Submit a Pull Request against the master branch and wait for the code to be reviewed and merged.
21+
4. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged.
2222

2323
If you're not used to this workflow with git, you can start with some [basic docs from GitHub](https://help.github.com/articles/fork-a-repo/) or even their [excellent interactive tutorial](https://try.github.io/).
2424

25-
For further information/help, please consult the [nf-core/atacseq documentation](https://github.com/nf-core/atacseq#documentation) and don't hesitate to get in touch on [Gitter](https://gitter.im/nf-core/Lobby)
25+
26+
## Tests
27+
When you create a pull request with changes, [Travis CI](https://travis-ci.org/) will run automatic tests.
28+
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
29+
30+
There are typically two types of tests that run:
31+
32+
### Lint Tests
33+
The nf-core has a [set of guidelines](http://nf-co.re/guidelines) which all pipelines must adhere to.
34+
To enforce these and ensure that all pipelines stay in sync, we have developed a helper tool which runs checks on the pipeline code. This is in the [nf-core/tools repository](https://github.com/nf-core/tools) and once installed can be run locally with the `nf-core lint <pipeline-directory>` command.
35+
36+
If any failures or warnings are encountered, please follow the listed URL for more documentation.
37+
38+
### Pipeline Tests
39+
Each nf-core pipeline should be set up with a minimal set of test-data.
40+
Travis CI then runs the pipeline on this data to ensure that it exists successfully.
41+
If there are any failures then the automated tests fail.
42+
These tests are run both with the latest available version of Nextflow and also the minimum required version that is stated in the pipeline code.
43+
44+
## Getting help
45+
For further information/help, please consult the [nf-core/atacseq documentation](https://github.com/nf-core/atacseq#documentation) and don't hesitate to get in touch on the nf-core `atacseq` channel on [Slack](https://nf-core-invite.herokuapp.com/).
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Hi there!
2+
3+
Thanks for telling us about a problem with the pipeline. Please delete this text and anything that's not relevant from the template below:
4+
5+
#### Describe the bug
6+
A clear and concise description of what the bug is.
7+
8+
#### Steps to reproduce
9+
Steps to reproduce the behaviour:
10+
1. Command line: `nextflow run ...`
11+
2. See error: _Please provide your error message_
12+
13+
#### Expected behaviour
14+
A clear and concise description of what you expected to happen.
15+
16+
#### System:
17+
- Hardware: [e.g. HPC, Desktop, Cloud...]
18+
- Executor: [e.g. slurm, local, awsbatch...]
19+
- OS: [e.g. CentOS Linux, macOS, Linux Mint...]
20+
- Version [e.g. 7, 10.13.6, 18.3...]
21+
22+
#### Nextflow Installation:
23+
- Version: [e.g. 0.31.0]
24+
25+
#### Container engine:
26+
- Engine: [e.g. Conda, Docker or Singularity]
27+
- version: [e.g. 1.0.0]
28+
- Image tag: [e.g. nfcore/imcyto:1.0.0]
29+
30+
#### Additional context
31+
Add any other context about the problem here.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Hi there!
2+
3+
Thanks for suggesting a new feature for the pipeline! Please delete this text and anything that's not relevant from the template below:
4+
5+
#### Is your feature request related to a problem? Please describe.
6+
A clear and concise description of what the problem is.
7+
Ex. I'm always frustrated when [...]
8+
9+
#### Describe the solution you'd like
10+
A clear and concise description of what you want to happen.
11+
12+
#### Describe alternatives you've considered
13+
A clear and concise description of any alternative solutions or features you've considered.
14+
15+
#### Additional context
16+
Add any other context about the feature request here.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Please fill in the appropriate checklist below (delete whatever is not relevant)
55
## PR checklist
66
- [ ] This comment contains a description of changes (with reason)
77
- [ ] If you've fixed a bug or added code that should be tested, add tests!
8-
- [ ] If necessary, also make a PR on the [nf-core/atacseq branch on the nf-core/test-datasets repo]( https://github.com/nf-core/test-datasets/pull/newnf-core/atacseq)
8+
- [ ] If necessary, also make a PR on the [nf-core/atacseq branch on the nf-core/test-datasets repo]( https://github.com/nf-core/test-datasets/pull/new/nf-core/atacseq)
99
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
1010
- [ ] Make sure your code lints (`nf-core lint .`).
1111
- [ ] Documentation in `docs` is updated

.github/bug_report.md

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

.github/feature_request.md

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

.github/markdownlint.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Markdownlint configuration file
2+
default: true,
3+
line-length: false
4+
no-multiple-blanks: 0
5+
blanks-around-headers: false
6+
blanks-around-lists: false
7+
header-increment: false
8+
no-duplicate-header:
9+
siblings_only: true

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@ before_install:
1313
# Pull the docker image first so the test doesn't wait for this
1414
- docker pull nfcore/atacseq:dev
1515
# Fake the tag locally so that the pipeline runs properly
16-
- docker tag nfcore/atacseq:dev nfcore/atacseq:latest
16+
# Looks weird when this is :dev to :dev, but makes sense when testing code for a release (:dev to :1.0.1)
17+
- docker tag nfcore/atacseq:dev nfcore/atacseq:1.0.0
1718

1819
install:
1920
# Install Nextflow
2021
- mkdir /tmp/nextflow && cd /tmp/nextflow
2122
- wget -qO- get.nextflow.io | bash
2223
- sudo ln -s /tmp/nextflow/nextflow /usr/local/bin/nextflow
2324
# Install nf-core/tools
24-
- pip install --upgrade pip # Get rid of dependency resolve issues from older pip versions
25+
- pip install --upgrade pip
2526
- pip install nf-core
2627
# Reset
2728
- mkdir ${TRAVIS_BUILD_DIR}/tests && cd ${TRAVIS_BUILD_DIR}/tests
29+
# Install markdownlint-cli
30+
- sudo apt-get install npm && npm install -g markdownlint-cli
2831

2932
env:
3033
- NXF_VER='0.32.0' # Specify a minimum NF version that should be tested and work
@@ -33,5 +36,7 @@ env:
3336
script:
3437
# Lint the pipeline code
3538
- nf-core lint ${TRAVIS_BUILD_DIR}
39+
# Lint the documentation
40+
- markdownlint ${TRAVIS_BUILD_DIR} -c ${TRAVIS_BUILD_DIR}/.github/markdownlint.yml
3641
# Run the pipeline with the test profile
3742
- nextflow run ${TRAVIS_BUILD_DIR} -profile test,docker

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# nf-core/atacseq: Changelog
12

2-
## nf-core/atacseq version 1.0dev - <date>
3+
## v1.0dev - [date]
34
Initial release of nf-core/atacseq, created with the [nf-core](http://nf-co.re/) template.

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434

3535
## Enforcement
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team on the [Gitter channel](https://gitter.im/nf-core/Lobby). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team on [Slack](https://nf-core-invite.herokuapp.com/). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
3838

3939
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
4040

0 commit comments

Comments
 (0)