Skip to content

Commit 14f0ab4

Browse files
committed
Template update for nf-core/tools version 3.0.0
1 parent eecf64e commit 14f0ab4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1220
-810
lines changed

.editorconfig

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ indent_style = space
1111
[*.{md,yml,yaml,html,css,scss,js}]
1212
indent_size = 2
1313

14+
1415
# These files are edited and tested upstream in nf-core/modules
1516
[/modules/nf-core/**]
1617
charset = unset
@@ -25,9 +26,12 @@ insert_final_newline = unset
2526
trim_trailing_whitespace = unset
2627
indent_style = unset
2728

29+
30+
2831
[/assets/email*]
2932
indent_size = unset
3033

34+
3135
# ignore python and markdown
3236
[*.{py,md}]
3337
indent_style = unset

.github/CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you'd like to write some code for nf-core/rnaseq, the standard workflow is as
1919
1. Check that there isn't already an issue about your idea in the [nf-core/rnaseq issues](https://github.com/nf-core/rnaseq/issues) to avoid duplicating work. 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/rnaseq repository](https://github.com/nf-core/rnaseq) to your GitHub account
2121
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).
22+
4. Use `nf-core pipelines 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/).
@@ -40,7 +40,7 @@ There are typically two types of tests that run:
4040
### Lint tests
4141

4242
`nf-core` has a [set of guidelines](https://nf-co.re/developers/guidelines) which all pipelines must adhere to.
43-
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.
43+
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 pipelines lint <pipeline-directory>` command.
4444

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

@@ -75,7 +75,7 @@ If you wish to contribute a new step, please use the following coding standards:
7575
2. Write the process block (see below).
7676
3. Define the output channel if needed (see below).
7777
4. Add any new parameters to `nextflow.config` with a default (see below).
78-
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core schema build` tool).
78+
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
7979
6. Add sanity checks and validation for all relevant parameters.
8080
7. Perform local tests to validate that the new code works as expected.
8181
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
@@ -86,7 +86,7 @@ If you wish to contribute a new step, please use the following coding standards:
8686

8787
Parameters should be initialised / defined with default values in `nextflow.config` under the `params` scope.
8888

89-
Once there, use `nf-core schema build` to add to `nextflow_schema.json`.
89+
Once there, use `nf-core pipelines schema build` to add to `nextflow_schema.json`.
9090

9191
### Default processes resource requirements
9292

@@ -103,7 +103,7 @@ Please use the following naming schemes, to make it easy to understand what is g
103103

104104
### Nextflow version bumping
105105

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]`
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 pipelines bump-version --nextflow . [min-nf-version]`
107107

108108
### Images and figures
109109

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/rnas
1717
- [ ] If you've fixed a bug or added code that should be tested, add tests!
1818
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/rnaseq/tree/master/.github/CONTRIBUTING.md)
1919
- [ ] If necessary, also make a PR on the nf-core/rnaseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
20-
- [ ] Make sure your code lints (`nf-core lint`).
20+
- [ ] Make sure your code lints (`nf-core pipelines lint`).
2121
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
2222
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
2323
- [ ] Usage Documentation in `docs/usage.md` is updated.

.github/workflows/awsfulltest.yml

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,33 @@
11
name: nf-core AWS full size tests
2-
# This workflow is triggered on published releases.
2+
# This workflow is triggered on PRs opened against the master branch.
33
# It can be additionally triggered manually with GitHub actions workflow dispatch button.
44
# It runs the -profile 'test_full' on AWS batch
55

66
on:
7-
release:
8-
types: [published]
7+
pull_request:
8+
branches:
9+
- master
910
workflow_dispatch:
11+
pull_request_review:
12+
types: [submitted]
13+
1014
jobs:
1115
run-platform:
1216
name: Run AWS full tests
13-
if: github.repository == 'nf-core/rnaseq'
17+
if: github.repository == 'nf-core/rnaseq' && github.event.review.state == 'approved'
1418
runs-on: ubuntu-latest
1519
steps:
20+
- uses: octokit/[email protected]
21+
id: check_approvals
22+
with:
23+
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.review.number }}/reviews
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
- id: test_variables
27+
run: |
28+
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
29+
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
30+
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
1631
- name: Launch workflow via Seqera Platform
1732
uses: seqeralabs/action-tower-launch@v2
1833
# TODO nf-core: You can customise AWS full pipeline tests as required

.github/workflows/ci.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
release:
99
types: [published]
10+
workflow_dispatch:
1011

1112
env:
1213
NXF_ANSI_LOG: false
@@ -24,7 +25,7 @@ jobs:
2425
strategy:
2526
matrix:
2627
NXF_VER:
27-
- "23.04.0"
28+
- "24.04.2"
2829
- "latest-everything"
2930
steps:
3031
- name: Check out pipeline code
@@ -38,9 +39,21 @@ jobs:
3839
- name: Disk space cleanup
3940
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
4041

41-
- name: Run pipeline with test data
42+
- name: Run pipeline with test data (docker)
4243
# TODO nf-core: You can customise CI pipeline run tests as required
4344
# For example: adding multiple test runs with different parameters
4445
# Remember that you can parallelise this by using strategy.matrix
4546
run: |
4647
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
48+
49+
- name: Run pipeline with test data (singularity)
50+
# TODO nf-core: You can customise CI pipeline run tests as required
51+
run: |
52+
nextflow run ${GITHUB_WORKSPACE} -profile test,singularity --outdir ./results
53+
if: "${{ github.base_ref == 'master' }}"
54+
55+
- name: Run pipeline with test data (conda)
56+
# TODO nf-core: You can customise CI pipeline run tests as required
57+
run: |
58+
nextflow run ${GITHUB_WORKSPACE} -profile test,conda --outdir ./results
59+
if: "${{ github.base_ref == 'master' }}"

.github/workflows/download_pipeline.yml

+43-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test successful pipeline download with 'nf-core download'
1+
name: Test successful pipeline download with 'nf-core pipelines download'
22

33
# Run the workflow when:
44
# - dispatched manually
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99
inputs:
1010
testbranch:
11-
description: "The specific branch you wish to utilize for the test execution of nf-core download."
11+
description: "The specific branch you wish to utilize for the test execution of nf-core pipelines download."
1212
required: true
1313
default: "dev"
1414
pull_request:
@@ -39,9 +39,11 @@ jobs:
3939
with:
4040
python-version: "3.12"
4141
architecture: "x64"
42-
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
42+
43+
- name: Setup Apptainer
44+
uses: eWaterCycle/setup-apptainer@4bb22c52d4f63406c49e94c804632975787312b3 # v2.0.0
4345
with:
44-
singularity-version: 3.8.3
46+
apptainer-version: 1.3.4
4547

4648
- name: Install dependencies
4749
run: |
@@ -54,33 +56,64 @@ jobs:
5456
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
5557
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}
5658
59+
- name: Make a cache directory for the container images
60+
run: |
61+
mkdir -p ./singularity_container_images
62+
5763
- name: Download the pipeline
5864
env:
59-
NXF_SINGULARITY_CACHEDIR: ./
65+
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
6066
run: |
61-
nf-core download ${{ env.REPO_LOWERCASE }} \
67+
nf-core pipelines download ${{ env.REPO_LOWERCASE }} \
6268
--revision ${{ env.REPO_BRANCH }} \
6369
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
6470
--compress "none" \
6571
--container-system 'singularity' \
66-
--container-library "quay.io" -l "docker.io" -l "ghcr.io" \
72+
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io" \
6773
--container-cache-utilisation 'amend' \
68-
--download-configuration
74+
--download-configuration 'yes'
6975
7076
- name: Inspect download
7177
run: tree ./${{ env.REPOTITLE_LOWERCASE }}
7278

79+
- name: Count the downloaded number of container images
80+
id: count_initial
81+
run: |
82+
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
83+
echo "Initial container image count: $image_count"
84+
echo "IMAGE_COUNT_INITIAL=$image_count" >> ${GITHUB_ENV}
85+
7386
- name: Run the downloaded pipeline (stub)
7487
id: stub_run_pipeline
7588
continue-on-error: true
7689
env:
77-
NXF_SINGULARITY_CACHEDIR: ./
90+
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
7891
NXF_SINGULARITY_HOME_MOUNT: true
7992
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
8093
- name: Run the downloaded pipeline (stub run not supported)
8194
id: run_pipeline
8295
if: ${{ job.steps.stub_run_pipeline.status == failure() }}
8396
env:
84-
NXF_SINGULARITY_CACHEDIR: ./
97+
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
8598
NXF_SINGULARITY_HOME_MOUNT: true
8699
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results
100+
101+
- name: Count the downloaded number of container images
102+
id: count_afterwards
103+
run: |
104+
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
105+
echo "Post-pipeline run container image count: $image_count"
106+
echo "IMAGE_COUNT_AFTER=$image_count" >> ${GITHUB_ENV}
107+
108+
- name: Compare container image counts
109+
run: |
110+
if [ "${{ env.IMAGE_COUNT_INITIAL }}" -ne "${{ env.IMAGE_COUNT_AFTER }}" ]; then
111+
initial_count=${{ env.IMAGE_COUNT_INITIAL }}
112+
final_count=${{ env.IMAGE_COUNT_AFTER }}
113+
difference=$((final_count - initial_count))
114+
echo "$difference additional container images were \n downloaded at runtime . The pipeline has no support for offline runs!"
115+
tree ./singularity_container_images
116+
exit 1
117+
else
118+
echo "The pipeline can be downloaded successfully!"
119+
fi

.github/workflows/linting.yml

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: nf-core linting
22
# This workflow is triggered on pushes and PRs to the repository.
3-
# It runs the `nf-core lint` and markdown lint tests to ensure
3+
# It runs the `nf-core pipelines lint` and markdown lint tests to ensure
44
# that the code meets the nf-core guidelines.
55
on:
66
push:
@@ -41,17 +41,32 @@ jobs:
4141
python-version: "3.12"
4242
architecture: "x64"
4343

44+
- name: read .nf-core.yml
45+
uses: pietrobolcato/[email protected]
46+
id: read_yml
47+
with:
48+
config: ${{ github.workspace }}/.nf-core.yaml
49+
4450
- name: Install dependencies
4551
run: |
4652
python -m pip install --upgrade pip
47-
pip install nf-core
53+
pip install nf-core==${{ steps.read_yml.outputs['nf_core_version'] }}
54+
55+
- name: Run nf-core pipelines lint
56+
if: ${{ github.base_ref != 'master' }}
57+
env:
58+
GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }}
61+
run: nf-core -l lint_log.txt pipelines lint --dir ${GITHUB_WORKSPACE} --markdown lint_results.md
4862

49-
- name: Run nf-core lint
63+
- name: Run nf-core pipelines lint --release
64+
if: ${{ github.base_ref == 'master' }}
5065
env:
5166
GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
5267
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5368
GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }}
54-
run: nf-core -l lint_log.txt lint --dir ${GITHUB_WORKSPACE} --markdown lint_results.md
69+
run: nf-core -l lint_log.txt pipelines lint --release --dir ${GITHUB_WORKSPACE} --markdown lint_results.md
5570

5671
- name: Save PR number
5772
if: ${{ always() }}

.github/workflows/linting_comment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Download lint results
14-
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3
14+
uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed

.github/workflows/release-announcements.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: get topics and convert to hashtags
1313
id: get_topics
1414
run: |
15-
echo "topics=$(curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ')" >> $GITHUB_OUTPUT
15+
echo "topics=$(curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ')" | sed 's/-//g' >> $GITHUB_OUTPUT
1616
1717
- uses: rzr/fediverse-action@master
1818
with:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: nf-core template version comment
2+
# This workflow is triggered on PRs to check if the pipeline template version matches the latest nf-core version.
3+
# It posts a comment to the PR, even if it comes from a fork.
4+
5+
on: pull_request_target
6+
7+
jobs:
8+
template_version:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check out pipeline code
12+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
13+
14+
- name: Read template version from .nf-core.yml
15+
uses: pietrobolcato/[email protected]
16+
id: read_yml
17+
with:
18+
config: ${{ github.workspace }}/.nf-core.yml
19+
20+
- name: Install nf-core
21+
run: |
22+
python -m pip install --upgrade pip
23+
pip install nf-core==${{ steps.read_yml.outputs['nf_core_version'] }}
24+
25+
- name: Check nf-core outdated
26+
id: nf_core_outdated
27+
run: pip list --outdated | grep nf-core
28+
29+
- name: Post nf-core template version comment
30+
uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2
31+
if: |
32+
${{ steps.nf_core_outdated.outputs.stdout }} =~ 'nf-core'
33+
with:
34+
repo-token: ${{ secrets.NF_CORE_BOT_AUTH_TOKEN }}
35+
allow-repeats: false
36+
message: |
37+
## :warning: Newer version of the nf-core template is available.
38+
39+
Your pipeline is using an old version of the nf-core template: ${{ steps.read_yml.outputs['nf_core_version'] }}.
40+
Please update your pipeline to the latest version.
41+
42+
For more documentation on how to update your pipeline, please see the [nf-core documentation](https://github.com/nf-core/tools?tab=readme-ov-file#sync-a-pipeline-with-the-template) and [Synchronisation documentation](https://nf-co.re/docs/contributing/sync).
43+
#

.gitpod.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ tasks:
44
command: |
55
pre-commit install --install-hooks
66
nextflow self-update
7-
- name: unset JAVA_TOOL_OPTIONS
8-
command: |
9-
unset JAVA_TOOL_OPTIONS
107
118
vscode:
129
extensions: # based on nf-core.nf-core-extensionpack
13-
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
10+
#- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
1411
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
1512
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
1613
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
17-
# - nextflow.nextflow # Nextflow syntax highlighting
14+
- nextflow.nextflow # Nextflow syntax highlighting
1815
- oderwat.indent-rainbow # Highlight indentation level
1916
- streetsidesoftware.code-spell-checker # Spelling checker for source code
2017
- charliermarsh.ruff # Code linter Ruff

0 commit comments

Comments
 (0)