Skip to content

Commit 85e2e32

Browse files
authored
Merge pull request #621 from nf-core/dev
Patch Release 2.2.2
2 parents 7971d89 + 5ead4b0 commit 85e2e32

35 files changed

Lines changed: 2317 additions & 2322 deletions

.github/CONTRIBUTING.md

Lines changed: 61 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ If you'd like to write some code for nf-core/eager, the standard workflow is as
1818
1. Check that there isn't already an issue about your idea in the [nf-core/eager issues](https://github.com/nf-core/eager/issues) to avoid duplicating work
1919
* If there isn't one already, please create one so that others know you're working on this
2020
2. [Fork](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the [nf-core/eager repository](https://github.com/nf-core/eager) to your GitHub account
21-
3. Make the necessary changes / additions within your forked repository (following [code contribution guidelines](https://github.com/nf-core/eager/blob/dev/.github/CONTRIBUTING.md))
22-
4. Use `nf-core schema build .` and add any new parameters to the pipeline JSON schema (requires nf-core tools >= 1.10).
21+
3. Make the necessary changes / additions within your forked repository following [Pipeline conventions](#pipeline-contribution-conventions)
22+
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).
2323
5. Submit a Pull Request against the `dev` branch and wait for the code to be reviewed and merged
2424

2525
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/).
@@ -31,14 +31,14 @@ Typically, pull-requests are only fully reviewed when these tests are passing, t
3131

3232
There are typically two types of tests that run:
3333

34-
### Lint Tests
34+
### Lint tests
3535

3636
`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
3737
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.
3838

3939
If any failures or warnings are encountered, please follow the listed URL for more documentation.
4040

41-
### Pipeline Tests
41+
### Pipeline tests
4242

4343
Each `nf-core` pipeline should be set up with a minimal set of test-data.
4444
`GitHub Actions` then runs the pipeline on this data to ensure that it exits successfully.
@@ -55,38 +55,82 @@ These tests are run both with the latest available version of `Nextflow` and als
5555

5656
## Getting help
5757

58-
For further information/help, please consult the [nf-core/eager documentation](https://nf-co.re/eager/latest/usage) and don't hesitate to get in touch on the nf-core Slack [#eager](https://nfcore.slack.com/channels/eager) channel ([join our Slack here](https://nf-co.re/join/slack)).
58+
For further information/help, please consult the [nf-core/eager documentation](https://nf-co.re/eager/usage) and don't hesitate to get in touch on the nf-core Slack [#eager](https://nfcore.slack.com/channels/eager) channel ([join our Slack here](https://nf-co.re/join/slack)).
5959

60-
# Code Contribution Guidelines
60+
## Pipeline contribution conventions
6161

62-
To make the EAGER2 code and processing logic more understandable for new contributors, and to ensure quality. We are making an attempt to somewhat-standardise the way the code is written.
62+
To make the nf-core/eager 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.
6363

64-
If you wish to contribute a new module, please use the following coding standards.
64+
### Adding a new step
6565

66-
The typical workflow for adding a new module is as follows:
66+
If you wish to contribute a new step, please use the following coding standards:
6767

68-
1. Define the corresponding input channel into your new process from the expected previous process channel (or re-routing block, see below).
68+
1. Define the corresponding input channel into your new process from the expected previous process channel
6969
2. Write the process block (see below).
7070
3. Define the output channel if needed (see below).
7171
4. Add any new flags/options to `nextflow.config` with a default (see below).
72-
5. Add any new flags/options to `nextflow_schema.json` with help text (with `nf-core schema build .`)
72+
5. Add any new flags/options to `nextflow_schema.json` **with help text** (with `nf-core schema build .`)
7373
6. Add any new flags/options to the help message (for integer/text parameters, print to help the corresponding `nextflow.config` parameter).
7474
7. Add sanity checks for all relevant parameters.
7575
8. Add any new software to the `scrape_software_versions.py` script in `bin/` and the version command to the `scrape_software_versions` process in `main.nf`.
7676
9. Do local tests that the new code works properly and as expected.
7777
10. Add a new test command in `.github/workflow/ci.yaml`.
7878
11. If applicable add a [MultiQC](https://https://multiqc.info/) module.
7979
12. Update MultiQC config `assets/multiqc_config.yaml` so relevant suffixes, name clean up, General Statistics Table column order, and module figures are in the right order.
80-
13. Add new flags/options to 'usage' documentation under `docs/usage.md`.
81-
14. Add any descriptions of MultiQC report sections and output files to `docs/output.md`.
80+
13. Optional: Add any descriptions of MultiQC report sections and output files to `docs/output.md`.
8281

83-
## Default Values
82+
### Default values
8483

85-
Default values should go in `nextflow.config` under the `params` scope, and `nextflow_schema.json` (latter with `nf-core schema build .`)
84+
Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
8685

87-
## Default resource processes
86+
Once there, use `nf-core schema build .` to add to `nextflow_schema.json`.
8887

89-
Defining recommended 'minimum' resource requirements (CPUs/Memory) for a process should be defined in `conf/base.config`. This can be utilised within the process using `${task.cpu}` or `${task.memory}` variables in the `script:` block.
88+
### Default processes resource requirements
89+
90+
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/%7B%7Bcookiecutter.name_noslash%7D%7D/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.
91+
92+
:warning: Note that in nf-core/eager we currently have our own custom process labels, so please check `base.config`!
93+
94+
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.
95+
96+
### Naming schemes
97+
98+
Please use the following naming schemes, to make it easy to understand what is going where.
99+
100+
* initial process channel: `ch_output_from_<process>`
101+
* intermediate and terminal channels: `ch_<previousprocess>_for_<nextprocess>`
102+
* skipped process output: `ch_<previousstage>_for_<skipprocess>`(this goes out of the bypass statement described above)
103+
104+
### Nextflow version bumping
105+
106+
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]`
107+
108+
### Software version reporting
109+
110+
If you add a new tool to the pipeline, please ensure you add the information of the tool to the `get_software_version` process.
111+
112+
Add to the script block of the process, something like the following:
113+
114+
```bash
115+
<YOUR_TOOL> --version &> v_<YOUR_TOOL>.txt 2>&1 || true
116+
```
117+
118+
or
119+
120+
```bash
121+
<YOUR_TOOL> --help | head -n 1 &> v_<YOUR_TOOL>.txt 2>&1 || true
122+
```
123+
124+
You then need to edit the script `bin/scrape_software_versions.py` to:
125+
126+
1. Add a Python regex for your tool's `--version` output (as in stored in the `v_<YOUR_TOOL>.txt` file), to ensure the version is reported as a `v` and the version number e.g. `v2.1.1`
127+
2. Add a HTML entry to the `OrderedDict` for formatting in MultiQC.
128+
129+
### Images and figures
130+
131+
For overview images and other documents we follow the nf-core [style guidelines and examples](https://nf-co.re/developers/design_guidelines).
132+
133+
For all internal nf-core/eager documentation images we are using the 'Kalam' font by the Indian Type Foundry and licensed under the Open Font License. It can be found for download here [here](https://fonts.google.com/specimen/Kalam).
90134

91135
## Process Concept
92136

@@ -164,44 +208,3 @@ if (params.run_fastp) {
164208
}
165209
166210
```
167-
168-
## Naming Schemes
169-
170-
Please use the following naming schemes, to make it easy to understand what is going where.
171-
172-
* process output: `ch_output_from_<process>`(this should always go into the bypass statement described above).
173-
* skipped process output: `ch_<previousstage>_for_<skipprocess>`(this goes out of the bypass statement described above)
174-
* process inputs: `ch_<previousstage>_for_<process>` (this goes into a process)
175-
176-
## Nextflow Version Bumping
177-
178-
If you have agreement from reviewers, you may bump the 'default' minimum version of nextflow (e.g. for testing), with `nf-core bump-version`.
179-
180-
## Software Version Reporting
181-
182-
If you add a new tool to the pipeline, please ensure you add the information of the tool to the `get_software_version` process.
183-
184-
Add to the script block of the process, something like the following:
185-
186-
```bash
187-
<YOUR_TOOL> --version &> v_<YOUR_TOOL>.txt 2>&1 || true
188-
```
189-
190-
or
191-
192-
```bash
193-
<YOUR_TOOL> --help | head -n 1 &> v_<YOUR_TOOL>.txt 2>&1 || true
194-
```
195-
196-
You then need to edit the script `bin/scrape_software_versions.py` to
197-
198-
1. add a (python) regex for your tools --version output (as in stored in the `v_<YOUR_TOOL>.txt` file), to ensure the version is reported as a `v` and the version number e.g. `v2.1.1`
199-
2. add a HTML block entry to the `OrderedDict` for formatting in MultiQC.
200-
201-
> If a tool does not unfortunately offer any printing of version data, you may add this 'manually' e.g. with `echo "v1.1" > v_<YOUR_TOOL>.txt`
202-
203-
## Images and Figures
204-
205-
For all internal nf-core/eager documentation images we are using the 'Kalam' font by the Indian Type Foundry and licensed under the Open Font License. It can be found for download here [here](https://fonts.google.com/specimen/Kalam).
206-
207-
For the overview image we follow the nf-core [style guidelines](https://nf-co.re/developers/design_guidelines).
Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1-
# nf-core/eager bug report
1+
---
2+
name: Bug report
3+
about: Report something that is broken or incorrect
4+
labels: bug
5+
---
26

37
<!--
8+
# nf-core/eager bug report
9+
410
Hi there!
511
612
Thanks for telling us about a problem with the pipeline.
7-
813
Please delete this text and anything that's not relevant from the template below:
914
-->
1015

1116
## Check Documentation
1217

13-
Have you checked in the following places for your error?:
14-
15-
- [ ] [Frequently Asked Questions](https://github.com/nf-core/eager/blob/master/docs/usage.md#troubleshooting-and-faqs)
16-
(for nf-core/eager specific information)
17-
- [ ] [Troubleshooting](https://nf-co.re/usage/troubleshooting)
18-
(for nf-core specific information)
18+
I have checked the following places for your error:
1919

20-
Please also check the the corresponding version's documentation on github, if not
21-
testing the latest release.
20+
- [ ] [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
21+
- [ ] [nf-core/eager pipeline documentation](https://nf-co.re/nf-core/eager/usage)
22+
- nf-core/eager FAQ/troubleshooting can be found [here](https://nf-co.re/eager/usage#troubleshooting-and-faqs)
2223

23-
## Describe the bug
24+
## Description of the bug
2425

25-
A clear and concise description of what the bug is.
26+
<!-- A clear and concise description of what the bug is. -->
2627

2728
## Steps to reproduce
2829

@@ -33,13 +34,15 @@ Steps to reproduce the behaviour:
3334

3435
## Expected behaviour
3536

36-
A clear and concise description of what you expected to happen.
37+
<!-- A clear and concise description of what you expected to happen. -->
3738

3839
## Log files
3940

40-
1. The command used to run the pipeline
41-
2. The `.nextflow.log` file (which is a hidden file in whichever place you _ran_
42-
the pipeline from - not necessarily in the output directory!)
41+
Have you provided the following extra information/files:
42+
43+
- [ ] The command used to run the pipeline
44+
- [ ] The `.nextflow.log` file <!-- this is a hidden file in the directory where you launched the pipeline -->
45+
- [ ] The exact error: <!-- [Please provide your error message] -->
4346

4447
## System
4548

@@ -54,10 +57,10 @@ A clear and concise description of what you expected to happen.
5457

5558
## Container engine
5659

57-
- Engine: <!-- [e.g. Conda, Docker or Singularity] -->
58-
- version: <!-- [e.g. 2.1.0] -->
59-
- Image tag: <!-- [e.g. nfcore/eager:2.1.0] -->
60+
- Engine: <!-- [e.g. Conda, Docker, Singularity or Podman] -->
61+
- version: <!-- [e.g. 1.0.0] -->
62+
- Image tag: <!-- [e.g. nfcore/eager:1.0.0] -->
6063

6164
## Additional context
6265

63-
Add any other context about the problem here.
66+
<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Join nf-core
4+
url: https://nf-co.re/join
5+
about: Please join the nf-core community here
6+
- name: "Slack #eager channel"
7+
url: https://nfcore.slack.com/channels/eager
8+
about: Discussion about the nf-core/eager pipeline

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
# nf-core/eager feature request
1+
---
2+
name: Feature request
3+
about: Suggest an idea for the nf-core website
4+
labels: enhancement
5+
---
6+
27
<!--
8+
# nf-core/eager feature request
39
410
Hi there!
511

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
# nf-core/eager pull request
21
<!--
2+
# nf-core/eager pull request
33
44
Many thanks for contributing to nf-core/eager!
55
66
Please fill in the appropriate checklist below (delete whatever is not relevant).
77
These are the most common things requested on pull requests (PRs).
8+
9+
Remember that PRs should be made against the dev branch, unless you're preparing a pipeline release.
10+
11+
Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/eager/tree/master/.github/CONTRIBUTING.md)
812
-->
913

1014
## PR checklist
1115

12-
- [ ] This comment contains a description of changes (with reason)
16+
- [ ] This comment contains a description of changes (with reason).
1317
- [ ] If you've fixed a bug or added code that should be tested, add tests!
14-
- [ ] If necessary, also make a PR on the [nf-core/eager branch on the nf-core/test-datasets repo](https://github.com/nf-core/test-datasets/pull/new/nf-core/eager)
15-
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --paired_end`).
16-
- [ ] Make sure your code lints ([`nf-core lint .`](https://nf-co.re/tools)).
17-
- [ ] Documentation in `docs` is updated
18-
- [ ] `CHANGELOG.md` is updated
19-
- [ ] `README.md` is updated
20-
21-
**Learn more about contributing:** [CONTRIBUTING.md](https://github.com/nf-core/eager/tree/master/.github/CONTRIBUTING.md)
18+
- [ ] If you've added a new tool - add to the software_versions process and a regex to `scrape_software_versions.py`
19+
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/eager/tree/master/.github/CONTRIBUTING.md)
20+
- [ ] If necessary, also make a PR on the nf-core/eager _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
21+
- [ ] Make sure your code lints (`nf-core lint .`).
22+
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
23+
- [ ] Usage Documentation in `docs/usage.md` is updated.
24+
- [ ] Output Documentation in `docs/output.md` is updated.
25+
- [ ] `CHANGELOG.md` is updated.
26+
- [ ] `README.md` is updated (including new tool citations and authors/contributors).

.github/markdownlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Markdownlint configuration file
2-
default: true,
2+
default: true
33
line-length: false
44
no-duplicate-header:
55
siblings_only: true
6-
no-inline-html:
6+
no-inline-html:
77
allowed_elements:
88
- img
99
- p

.github/workflows/awsfulltest.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ name: nf-core AWS full size tests
44
# It runs the -profile 'test_full' on AWS batch
55

66
on:
7-
release:
8-
types: [published]
7+
workflow_run:
8+
workflows: ["nf-core Docker push (release)"]
9+
types: [completed]
910
workflow_dispatch:
1011

1112
jobs:
@@ -15,7 +16,7 @@ jobs:
1516
runs-on: ubuntu-latest
1617
steps:
1718
- name: Setup Miniconda
18-
uses: goanpeca/setup-miniconda@v1.0.2
19+
uses: conda-incubator/setup-miniconda@v2
1920
with:
2021
auto-update-conda: true
2122
python-version: 3.7
@@ -38,4 +39,4 @@ jobs:
3839
--job-name nf-core-eager \
3940
--job-queue $AWS_JOB_QUEUE \
4041
--job-definition $AWS_JOB_DEFINITION \
41-
--container-overrides '{"command": ["nf-core/eager", "-r '"${GITHUB_SHA}"' -profile awsfulltest --outdir s3://'"${AWS_S3_BUCKET}"'/eager/results-'"${GITHUB_SHA}"' -w s3://'"${AWS_S3_BUCKET}"'/eager/work-'"${GITHUB_SHA}"' -with-tower"], "environment": [{"name": "TOWER_ACCESS_TOKEN", "value": "'"$TOWER_ACCESS_TOKEN"'"}]}'
42+
--container-overrides '{"command": ["nf-core/eager", "-r '"${GITHUB_SHA}"' -profile test_full --outdir s3://'"${AWS_S3_BUCKET}"'/eager/results-'"${GITHUB_SHA}"' -w s3://'"${AWS_S3_BUCKET}"'/eager/work-'"${GITHUB_SHA}"' -with-tower"], "environment": [{"name": "TOWER_ACCESS_TOKEN", "value": "'"$TOWER_ACCESS_TOKEN"'"}]}'

.github/workflows/awstest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Setup Miniconda
16-
uses: goanpeca/setup-miniconda@v1.0.2
16+
uses: conda-incubator/setup-miniconda@v2
1717
with:
1818
auto-update-conda: true
1919
python-version: 3.7

.github/workflows/branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: nf-core branch protection
22
# This workflow is triggered on PRs to master branch on the repository
33
# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
44
on:
5-
pull_request:
5+
pull_request_target:
66
branches: [master]
77

88
jobs:

0 commit comments

Comments
 (0)