Skip to content

Commit 850137a

Browse files
committed
Template update for nf-core/tools version 2.3
1 parent 4fe6205 commit 850137a

26 files changed

+421
-261
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Bug report
32
description: Report something that is broken or incorrect
43
labels: bug

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/ampl
1919
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/ampliseq/tree/master/.github/CONTRIBUTING.md)
2020
- [ ] If necessary, also make a PR on the nf-core/ampliseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2121
- [ ] Make sure your code lints (`nf-core lint`).
22-
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker`).
22+
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker` --outdir <OUTDIR>`).
2323
- [ ] Usage Documentation in `docs/usage.md` is updated.
2424
- [ ] Output Documentation in `docs/output.md` is updated.
2525
- [ ] `CHANGELOG.md` is updated.

.github/workflows/awsfulltest.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Launch workflow via tower
17-
uses: nf-core/tower-action@v2
17+
uses: nf-core/tower-action@v3
1818
# TODO nf-core: You can customise AWS full pipeline tests as required
1919
# Add full size test data (but still relatively small datasets for few samples)
2020
# on the `test_full.config` test runs with only one set of parameters
@@ -31,4 +31,6 @@ jobs:
3131
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/ampliseq/results-${{ github.sha }}"
3232
}
3333
profiles: test_full,aws_tower
34-
pre_run_script: 'export NXF_VER=21.10.3'
34+
nextflow_config: |
35+
process.errorStrategy = 'retry'
36+
process.maxRetries = 3

.github/workflows/awstest.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Launch workflow via tower
14-
uses: nf-core/tower-action@v2
14+
uses: nf-core/tower-action@v3
1515

1616
with:
1717
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
@@ -25,4 +25,6 @@ jobs:
2525
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/ampliseq/results-test-${{ github.sha }}"
2626
}
2727
profiles: test,aws_tower
28-
pre_run_script: 'export NXF_VER=21.10.3'
28+
nextflow_config: |
29+
process.errorStrategy = 'retry'
30+
process.maxRetries = 3

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414

1515
jobs:
1616
test:
17-
name: Run workflow tests
17+
name: Run pipeline with test data
1818
# Only run on push if this is the nf-core dev branch (merged PRs)
1919
if: ${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/ampliseq') }}
2020
runs-on: ubuntu-latest
@@ -47,4 +47,4 @@ jobs:
4747
# For example: adding multiple test runs with different parameters
4848
# Remember that you can parallelise this by using strategy.matrix
4949
run: |
50-
nextflow run ${GITHUB_WORKSPACE} -profile test,docker
50+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results

.github/workflows/linting.yml

+12-16
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v2
15-
- uses: actions/setup-node@v1
16-
with:
17-
node-version: '10'
15+
- uses: actions/setup-node@v2
1816
- name: Install markdownlint
1917
run: npm install -g markdownlint-cli
2018
- name: Run Markdownlint
@@ -51,9 +49,7 @@ jobs:
5149
steps:
5250
- uses: actions/checkout@v2
5351

54-
- uses: actions/setup-node@v1
55-
with:
56-
node-version: '10'
52+
- uses: actions/setup-node@v2
5753

5854
- name: Install editorconfig-checker
5955
run: npm install -g editorconfig-checker
@@ -64,14 +60,13 @@ jobs:
6460
YAML:
6561
runs-on: ubuntu-latest
6662
steps:
67-
- uses: actions/checkout@v1
68-
- uses: actions/setup-node@v1
63+
- name: Checkout
64+
uses: actions/checkout@master
65+
- name: 'Yamllint'
66+
uses: karancode/yamllint-github-action@master
6967
with:
70-
node-version: '10'
71-
- name: Install yaml-lint
72-
run: npm install -g yaml-lint
73-
- name: Run yaml-lint
74-
run: yamllint $(find ${GITHUB_WORKSPACE} -type f -name "*.yml" -o -name "*.yaml")
68+
yamllint_file_or_dir: '.'
69+
yamllint_config_filepath: '.yamllint.yml'
7570

7671
# If the above check failed, post a comment on the PR explaining the failure
7772
- name: Post PR comment
@@ -84,10 +79,11 @@ jobs:
8479
To keep the code consistent with lots of contributors, we run automated code consistency checks.
8580
To fix this CI test, please run:
8681
87-
* Install `yaml-lint`
88-
* [Install `npm`](https://www.npmjs.com/get-npm) then [install `yaml-lint`](https://www.npmjs.com/package/yaml-lint) (`npm install -g yaml-lint`)
82+
* Install `yamllint`
83+
* Install `yamllint` following [this](https://yamllint.readthedocs.io/en/stable/quickstart.html#installing-yamllint)
84+
instructions or alternative install it in your [conda environment](https://anaconda.org/conda-forge/yamllint)
8985
* Fix the markdown errors
90-
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml")`
86+
* Run the test locally: `yamllint $(find . -type f -name "*.yml" -o -name "*.yaml") -c ./.yamllint.yml`
9187
* Fix any reported errors in your YAML files
9288
9389
Once you push these changes the test should pass, and you can hide this comment :+1:

.gitpod.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
image: nfcore/gitpod:latest
2+
3+
vscode:
4+
extensions: # based on nf-core.nf-core-extensionpack
5+
- codezombiech.gitignore # Language support for .gitignore files
6+
# - cssho.vscode-svgviewer # SVG viewer
7+
- davidanson.vscode-markdownlint # Markdown/CommonMark linting and style checking for Visual Studio Code
8+
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
9+
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
10+
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
11+
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
12+
# - nextflow.nextflow # Nextflow syntax highlighting
13+
- oderwat.indent-rainbow # Highlight indentation level
14+
- streetsidesoftware.code-spell-checker # Spelling checker for source code

.nf-core.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
repository_type: pipeline

.yamllint.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
extends: default
2+
3+
rules:
4+
document-start: disable
5+
line-length: disable
6+
truthy: disable

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6-
## v2.2.0dev - [date]
6+
## v2.3.0dev - [date]
77

88
Initial release of nf-core/ampliseq, created with the [nf-core](https://nf-co.re/) template.
99

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ On release, automated continuous integration tests run the pipeline on a full-si
4040
3. Download the pipeline and test it on a minimal dataset with a single command:
4141

4242
```console
43-
nextflow run nf-core/ampliseq -profile test,YOURPROFILE
43+
nextflow run nf-core/ampliseq -profile test,YOURPROFILE --outdir <OUTDIR>
4444
```
4545

4646
Note that some form of configuration will be needed so that Nextflow knows how to fetch the required software. This is usually done in the form of a config profile (`YOURPROFILE` in the example command above). You can chain multiple config profiles in a comma-separated string.
4747

4848
> * The pipeline comes with config profiles called `docker`, `singularity`, `podman`, `shifter`, `charliecloud` and `conda` which instruct the pipeline to use the named tool for software management. For example, `-profile test,docker`.
4949
> * Please check [nf-core/configs](https://github.com/nf-core/configs#documentation) to see if a custom config file to run nf-core pipelines already exists for your Institute. If so, you can simply use `-profile <institute>` in your command. This will enable either `docker` or `singularity` and set the appropriate execution settings for your local compute environment.
50-
> * If you are using `singularity` and are persistently observing issues downloading Singularity images directly due to timeout or network issues, then you can use the `--singularity_pull_docker_container` parameter to pull and convert the Docker image instead. Alternatively, you can use the [`nf-core download`](https://nf-co.re/tools/#downloading-pipelines-for-offline-use) command to download images first, before running the pipeline. Setting the [`NXF_SINGULARITY_CACHEDIR` or `singularity.cacheDir`](https://www.nextflow.io/docs/latest/singularity.html?#singularity-docker-hub) Nextflow options enables you to store and re-use the images from a central location for future pipeline runs.
50+
> * If you are using `singularity`, please use the [`nf-core download`](https://nf-co.re/tools/#downloading-pipelines-for-offline-use) command to download images first, before running the pipeline. Setting the [`NXF_SINGULARITY_CACHEDIR` or `singularity.cacheDir`](https://www.nextflow.io/docs/latest/singularity.html?#singularity-docker-hub) Nextflow options enables you to store and re-use the images from a central location for future pipeline runs.
5151
> * If you are using `conda`, it is highly recommended to use the [`NXF_CONDA_CACHEDIR` or `conda.cacheDir`](https://www.nextflow.io/docs/latest/conda.html) settings to store the environments in a central location for future pipeline runs.
5252

5353
4. Start running your own analysis!
5454

5555
<!-- TODO nf-core: Update the example "typical command" below used to run the pipeline -->
5656

5757
```console
58-
nextflow run nf-core/ampliseq -profile <docker/singularity/podman/shifter/charliecloud/conda/institute> --input samplesheet.csv --genome GRCh37
58+
nextflow run nf-core/ampliseq --input samplesheet.csv --outdir <OUTDIR> --genome GRCh37 -profile <docker/singularity/podman/shifter/charliecloud/conda/institute>
5959
```
6060

6161
## Documentation

0 commit comments

Comments
 (0)