-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from nf-core/dev
dev -> Master for 2.0.0 release
- Loading branch information
Showing
208 changed files
with
11,213 additions
and
2,337 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
root = true | ||
|
||
[*] | ||
charset = utf-8 | ||
end_of_line = lf | ||
insert_final_newline = true | ||
trim_trailing_whitespace = true | ||
indent_size = 4 | ||
indent_style = space | ||
|
||
[*.{md,yml,yaml,html,css,scss,js,cff}] | ||
indent_size = 2 | ||
|
||
# These files are edited and tested upstream in nf-core/modules | ||
[/modules/nf-core/**] | ||
charset = unset | ||
end_of_line = unset | ||
insert_final_newline = unset | ||
trim_trailing_whitespace = unset | ||
indent_style = unset | ||
indent_size = unset | ||
|
||
[/assets/email*] | ||
indent_size = unset |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
*.config linguist-language=nextflow | ||
modules/nf-core/** linguist-generated | ||
subworkflows/nf-core/** linguist-generated |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# Dockstore config version, not pipeline version | ||
version: 1.2 | ||
workflows: | ||
- subclass: nfl | ||
primaryDescriptorPath: /nextflow.config | ||
publish: True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,103 @@ | ||
# nf-core/nascent: Contributing Guidelines | ||
|
||
Hi there! Many thanks for taking an interest in improving nf-core/nascent. | ||
Hi there! | ||
Many thanks for taking an interest in improving nf-core/nascent. | ||
|
||
We try to manage the required tasks for nf-core/nascent using GitHub issues, you probably came to this page when creating one. Please use the pre-filled template to save time. | ||
We try to manage the required tasks for nf-core/nascent using GitHub issues, you probably came to this page when creating one. | ||
Please use the pre-filled template to save time. | ||
|
||
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 ;) | ||
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 ;) | ||
|
||
> If you need help using or modifying nf-core/nascent then the best place to go is the Gitter chatroom where you can ask us questions directly: https://gitter.im/nf-core/Lobby | ||
> If you need help using or modifying nf-core/nascent then the best place to ask is on the nf-core Slack [#nascent](https://nfcore.slack.com/channels/nascent) channel ([join our Slack here](https://nf-co.re/join/slack)). | ||
## Contribution workflow | ||
If you'd like to write some code for nf-core/nascent, the standard workflow | ||
is as follows: | ||
|
||
1. Check that there isn't already an issue about your idea in the | ||
[nf-core/nascent issues](https://github.com/nf-core/nascent/issues) to avoid | ||
duplicating work. | ||
* If there isn't one already, please create one so that others know you're working on this | ||
2. Fork the [nf-core/nascent repository](https://github.com/nf-core/nascent) to your GitHub account | ||
3. Make the necessary changes / additions within your forked repository | ||
4. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged. | ||
If you'd like to write some code for nf-core/nascent, the standard workflow is as follows: | ||
|
||
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/). | ||
1. Check that there isn't already an issue about your idea in the [nf-core/nascent issues](https://github.com/nf-core/nascent/issues) to avoid duplicating work. If there isn't one already, please create one so that others know you're working on this | ||
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/nascent repository](https://github.com/nf-core/nascent) to your GitHub account | ||
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions) | ||
4. Use `nf-core schema build` and add any new parameters to the pipeline JSON schema (requires [nf-core tools](https://github.com/nf-core/tools) >= 1.10). | ||
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged | ||
|
||
If you're not used to this workflow with git, you can start with some [docs from GitHub](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests) or even their [excellent `git` resources](https://try.github.io/). | ||
|
||
## Tests | ||
When you create a pull request with changes, [Travis CI](https://travis-ci.org/) will run automatic tests. | ||
|
||
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests. | ||
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then. | ||
|
||
There are typically two types of tests that run: | ||
|
||
### Lint Tests | ||
The nf-core has a [set of guidelines](http://nf-co.re/guidelines) which all pipelines must adhere to. | ||
### Lint tests | ||
|
||
`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to. | ||
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. | ||
|
||
If any failures or warnings are encountered, please follow the listed URL for more documentation. | ||
|
||
### Pipeline Tests | ||
Each nf-core pipeline should be set up with a minimal set of test-data. | ||
Travis CI then runs the pipeline on this data to ensure that it exists successfully. | ||
### Pipeline tests | ||
|
||
Each `nf-core` pipeline should be set up with a minimal set of test-data. | ||
`GitHub Actions` then runs the pipeline on this data to ensure that it exits successfully. | ||
If there are any failures then the automated tests fail. | ||
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. | ||
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. | ||
|
||
## Patch | ||
|
||
:warning: Only in the unlikely and regretful event of a release happening with a bug. | ||
|
||
- On your own fork, make a new branch `patch` based on `upstream/master`. | ||
- Fix the bug, and bump version (X.Y.Z+1). | ||
- A PR should be made on `master` from patch to directly this particular bug. | ||
|
||
## Getting help | ||
For further information/help, please consult the [nf-core/nascent documentation](https://github.com/nf-core/nascent#documentation) and don't hesitate to get in touch on the pipeline channel on [Slack](https://nf-core-invite.herokuapp.com/). | ||
|
||
For further information/help, please consult the [nf-core/nascent documentation](https://nf-co.re/nascent/usage) and don't hesitate to get in touch on the nf-core Slack [#nascent](https://nfcore.slack.com/channels/nascent) channel ([join our Slack here](https://nf-co.re/join/slack)). | ||
|
||
## Pipeline contribution conventions | ||
|
||
To make the nf-core/nascent code and processing logic more understandable for new contributors and to ensure quality, we semi-standardise the way the code and other contributions are written. | ||
|
||
### Adding a new step | ||
|
||
If you wish to contribute a new step, please use the following coding standards: | ||
|
||
1. Define the corresponding input channel into your new process from the expected previous process channel | ||
2. Write the process block (see below). | ||
3. Define the output channel if needed (see below). | ||
4. Add any new parameters to `nextflow.config` with a default (see below). | ||
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool). | ||
6. Add sanity checks and validation for all relevant parameters. | ||
7. Perform local tests to validate that the new code works as expected. | ||
8. If applicable, add a new test command in `.github/workflow/ci.yml`. | ||
9. Update MultiQC config `assets/multiqc_config.yml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module. | ||
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`. | ||
|
||
### Default values | ||
|
||
Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope. | ||
|
||
Once there, use `nf-core schema build` to add to `nextflow_schema.json`. | ||
|
||
### Default processes resource requirements | ||
|
||
Sensible defaults for process resource requirements (CPUs / memory / time) for a process should be defined in `conf/base.config`. These should generally be specified generic with `withLabel:` selectors so they can be shared across multiple processes/steps of the pipeline. A nf-core standard set of labels that should be followed where possible can be seen in the [nf-core pipeline template](https://github.com/nf-core/tools/blob/master/nf_core/pipeline-template/conf/base.config), which has the default process as a single core-process, and then different levels of multi-core configurations for increasingly large memory requirements defined with standardised labels. | ||
|
||
The process resources can be passed on to the tool dynamically within the process with the `${task.cpu}` and `${task.memory}` variables in the `script:` block. | ||
|
||
### Naming schemes | ||
|
||
Please use the following naming schemes, to make it easy to understand what is going where. | ||
|
||
- initial process channel: `ch_output_from_<process>` | ||
- intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>` | ||
|
||
### Nextflow version bumping | ||
|
||
If you are using a new feature from core Nextflow, you may bump the minimum required version of nextflow in the pipeline with: `nf-core bump-version --nextflow . [min-nf-version]` | ||
|
||
### Images and figures | ||
|
||
For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines). |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
name: Bug report | ||
description: Report something that is broken or incorrect | ||
labels: bug | ||
body: | ||
- type: markdown | ||
attributes: | ||
value: | | ||
Before you post this issue, please check the documentation: | ||
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting) | ||
- [nf-core/nascent pipeline documentation](https://nf-co.re/nascent/usage) | ||
- type: textarea | ||
id: description | ||
attributes: | ||
label: Description of the bug | ||
description: A clear and concise description of what the bug is. | ||
validations: | ||
required: true | ||
|
||
- type: textarea | ||
id: command_used | ||
attributes: | ||
label: Command used and terminal output | ||
description: Steps to reproduce the behaviour. Please paste the command you used to launch the pipeline and the output from your terminal. | ||
render: console | ||
placeholder: | | ||
$ nextflow run ... | ||
Some output where something broke | ||
- type: textarea | ||
id: files | ||
attributes: | ||
label: Relevant files | ||
description: | | ||
Please drag and drop the relevant files here. Create a `.zip` archive if the extension is not allowed. | ||
Your verbose log file `.nextflow.log` is often useful _(this is a hidden file in the directory where you launched the pipeline)_ as well as custom Nextflow configuration files. | ||
- type: textarea | ||
id: system | ||
attributes: | ||
label: System information | ||
description: | | ||
* Nextflow version _(eg. 21.10.3)_ | ||
* Hardware _(eg. HPC, Desktop, Cloud)_ | ||
* Executor _(eg. slurm, local, awsbatch)_ | ||
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_ | ||
* OS _(eg. CentOS Linux, macOS, Linux Mint)_ | ||
* Version of nf-core/nascent _(eg. 1.1, 1.5, 1.8.2)_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
contact_links: | ||
- name: Join nf-core | ||
url: https://nf-co.re/join | ||
about: Please join the nf-core community here | ||
- name: "Slack #nascent channel" | ||
url: https://nfcore.slack.com/channels/nascent | ||
about: Discussion about the nf-core/nascent pipeline |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
name: Feature request | ||
description: Suggest an idea for the nf-core/nascent pipeline | ||
labels: enhancement | ||
body: | ||
- type: textarea | ||
id: description | ||
attributes: | ||
label: Description of feature | ||
description: Please describe your suggestion for a new feature. It might help to describe a problem or use case, plus any alternatives that you have considered. | ||
validations: | ||
required: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,24 @@ | ||
Many thanks to contributing to nf-core/nascent! | ||
<!-- | ||
# nf-core/nascent pull request | ||
Please fill in the appropriate checklist below (delete whatever is not relevant). These are the most common things requested on pull requests (PRs). | ||
Many thanks for contributing to nf-core/nascent! | ||
Please fill in the appropriate checklist below (delete whatever is not relevant). | ||
These are the most common things requested on pull requests (PRs). | ||
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release. | ||
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/nascent/tree/master/.github/CONTRIBUTING.md) | ||
--> | ||
|
||
## PR checklist | ||
- [ ] This comment contains a description of changes (with reason) | ||
- [ ] If you've fixed a bug or added code that should be tested, add tests! | ||
- [ ] If necessary, also make a PR on the [nf-core/nascent branch on the nf-core/test-datasets repo]( https://github.com/nf-core/test-datasets/pull/new/nf-core/nascent) | ||
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`). | ||
- [ ] Make sure your code lints (`nf-core lint .`). | ||
- [ ] Documentation in `docs` is updated | ||
- [ ] `CHANGELOG.md` is updated | ||
- [ ] `README.md` is updated | ||
|
||
**Learn more about contributing:** https://github.com/nf-core/nascent/tree/master/.github/CONTRIBUTING.md | ||
|
||
- [ ] This comment contains a description of changes (with reason). | ||
- [ ] If you've fixed a bug or added code that should be tested, add tests! | ||
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/nascent/tree/master/.github/CONTRIBUTING.md)- [ ] If necessary, also make a PR on the nf-core/nascent _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository. | ||
- [ ] Make sure your code lints (`nf-core lint`). | ||
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`). | ||
- [ ] Usage Documentation in `docs/usage.md` is updated. | ||
- [ ] Output Documentation in `docs/output.md` is updated. | ||
- [ ] `CHANGELOG.md` is updated. | ||
- [ ] `README.md` is updated (including new tool citations and authors/contributors). |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
name: nf-core AWS full size tests | ||
# This workflow is triggered on published releases. | ||
# It can be additionally triggered manually with GitHub actions workflow dispatch button. | ||
# It runs the -profile 'test_full' on AWS batch | ||
|
||
on: | ||
release: | ||
types: [published] | ||
workflow_dispatch: | ||
jobs: | ||
run-tower: | ||
name: Run AWS full tests | ||
if: github.repository == 'nf-core/nascent' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Launch workflow via tower | ||
uses: nf-core/tower-action@v3 | ||
# TODO nf-core: You can customise AWS full pipeline tests as required | ||
# Add full size test data (but still relatively small datasets for few samples) | ||
# on the `test_full.config` test runs with only one set of parameters | ||
with: | ||
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} | ||
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} | ||
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }} | ||
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/nascent/work-${{ github.sha }} | ||
parameters: | | ||
{ | ||
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/nascent/results-${{ github.sha }}" | ||
} | ||
profiles: test_full,aws_tower | ||
- uses: actions/upload-artifact@v3 | ||
with: | ||
name: Tower debug log file | ||
path: tower_action_*.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
name: nf-core AWS test | ||
# This workflow can be triggered manually with the GitHub actions workflow dispatch button. | ||
# It runs the -profile 'test' on AWS batch | ||
|
||
on: | ||
workflow_dispatch: | ||
jobs: | ||
run-tower: | ||
name: Run AWS tests | ||
if: github.repository == 'nf-core/nascent' | ||
runs-on: ubuntu-latest | ||
steps: | ||
# Launch workflow using Tower CLI tool action | ||
- name: Launch workflow via tower | ||
uses: nf-core/tower-action@v3 | ||
with: | ||
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }} | ||
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }} | ||
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }} | ||
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/nascent/work-${{ github.sha }} | ||
parameters: | | ||
{ | ||
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/nascent/results-test-${{ github.sha }}" | ||
} | ||
profiles: test,aws_tower | ||
- uses: actions/upload-artifact@v3 | ||
with: | ||
name: Tower debug log file | ||
path: tower_action_*.log |
Oops, something went wrong.