Skip to content

Commit d56e14d

Browse files
committed
Template update for nf-core/tools version 3.1.1
1 parent 1716af0 commit d56e14d

File tree

13 files changed

+71
-56
lines changed

13 files changed

+71
-56
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ indent_size = unset
3131
# ignore python and markdown
3232
[*.{py,md}]
3333
indent_style = unset
34+
35+
# ignore ro-crate metadata files
36+
[**/ro-crate-metadata.json]
37+
insert_final_newline = unset

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ body:
99
1010
- [nf-core website: troubleshooting](https://nf-co.re/usage/troubleshooting)
1111
- [nf-core/chipseq pipeline documentation](https://nf-co.re/chipseq/usage)
12-
1312
- type: textarea
1413
id: description
1514
attributes:

.github/workflows/download_pipeline.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ env:
2828
NXF_ANSI_LOG: false
2929

3030
jobs:
31-
download:
31+
configure:
3232
runs-on: ubuntu-latest
33+
outputs:
34+
REPO_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPO_LOWERCASE }}
35+
REPOTITLE_LOWERCASE: ${{ steps.get_repo_properties.outputs.REPOTITLE_LOWERCASE }}
36+
REPO_BRANCH: ${{ steps.get_repo_properties.outputs.REPO_BRANCH }}
3337
steps:
3438
- name: Install Nextflow
3539
uses: nf-core/setup-nextflow@v2
@@ -53,65 +57,70 @@ jobs:
5357
pip install git+https://github.com/nf-core/tools.git@dev
5458
5559
- name: Get the repository name and current branch set as environment variable
60+
id: get_repo_properties
5661
run: |
57-
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
58-
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> ${GITHUB_ENV}
59-
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> ${GITHUB_ENV}
62+
echo "REPO_LOWERCASE=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT"
63+
echo "REPOTITLE_LOWERCASE=$(basename ${GITHUB_REPOSITORY,,})" >> "$GITHUB_OUTPUT"
64+
echo "REPO_BRANCH=${{ github.event.inputs.testbranch || 'dev' }}" >> "$GITHUB_OUTPUT"
6065
6166
- name: Make a cache directory for the container images
6267
run: |
6368
mkdir -p ./singularity_container_images
6469
70+
download:
71+
runs-on: ubuntu-latest
72+
needs: configure
73+
steps:
6574
- name: Download the pipeline
6675
env:
6776
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
6877
run: |
69-
nf-core pipelines download ${{ env.REPO_LOWERCASE }} \
70-
--revision ${{ env.REPO_BRANCH }} \
71-
--outdir ./${{ env.REPOTITLE_LOWERCASE }} \
78+
nf-core pipelines download ${{ needs.configure.outputs.REPO_LOWERCASE }} \
79+
--revision ${{ needs.configure.outputs.REPO_BRANCH }} \
80+
--outdir ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }} \
7281
--compress "none" \
7382
--container-system 'singularity' \
7483
--container-library "quay.io" -l "docker.io" -l "community.wave.seqera.io/library/" \
7584
--container-cache-utilisation 'amend' \
7685
--download-configuration 'yes'
7786
7887
- name: Inspect download
79-
run: tree ./${{ env.REPOTITLE_LOWERCASE }}
88+
run: tree ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }}
8089

8190
- name: Count the downloaded number of container images
8291
id: count_initial
8392
run: |
8493
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
8594
echo "Initial container image count: $image_count"
86-
echo "IMAGE_COUNT_INITIAL=$image_count" >> ${GITHUB_ENV}
95+
echo "IMAGE_COUNT_INITIAL=$image_count" >> "$GITHUB_OUTPUT"
8796
8897
- name: Run the downloaded pipeline (stub)
8998
id: stub_run_pipeline
9099
continue-on-error: true
91100
env:
92101
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
93102
NXF_SINGULARITY_HOME_MOUNT: true
94-
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
103+
run: nextflow run ./${{needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
95104
- name: Run the downloaded pipeline (stub run not supported)
96105
id: run_pipeline
97-
if: ${{ job.steps.stub_run_pipeline.status == failure() }}
106+
if: ${{ steps.stub_run_pipeline.outcome == 'failure' }}
98107
env:
99108
NXF_SINGULARITY_CACHEDIR: ./singularity_container_images
100109
NXF_SINGULARITY_HOME_MOUNT: true
101-
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -profile test,singularity --outdir ./results
110+
run: nextflow run ./${{ needs.configure.outputs.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ needs.configure.outputs.REPO_BRANCH }}) -profile test,singularity --outdir ./results
102111

103112
- name: Count the downloaded number of container images
104113
id: count_afterwards
105114
run: |
106115
image_count=$(ls -1 ./singularity_container_images | wc -l | xargs)
107116
echo "Post-pipeline run container image count: $image_count"
108-
echo "IMAGE_COUNT_AFTER=$image_count" >> ${GITHUB_ENV}
117+
echo "IMAGE_COUNT_AFTER=$image_count" >> "$GITHUB_OUTPUT"
109118
110119
- name: Compare container image counts
111120
run: |
112-
if [ "${{ env.IMAGE_COUNT_INITIAL }}" -ne "${{ env.IMAGE_COUNT_AFTER }}" ]; then
113-
initial_count=${{ env.IMAGE_COUNT_INITIAL }}
114-
final_count=${{ env.IMAGE_COUNT_AFTER }}
121+
if [ "${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}" -ne "${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}" ]; then
122+
initial_count=${{ steps.count_initial.outputs.IMAGE_COUNT_INITIAL }}
123+
final_count=${{ steps.count_afterwards.outputs.IMAGE_COUNT_AFTER }}
115124
difference=$((final_count - initial_count))
116125
echo "$difference additional container images were \n downloaded at runtime . The pipeline has no support for offline runs!"
117126
tree ./singularity_container_images

.nf-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ lint:
33
- config_defaults:
44
- params.bamtools_filter_se_config
55
- params.bamtools_filter_pe_config
6-
nf_core_version: 3.1.0
6+
nf_core_version: 3.1.1
77
repository_type: pipeline
88
template:
99
author: Espinosa-Carrasco J, Patel H, Wang C, Ewels P

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ testing/
1010
testing*
1111
*.pyc
1212
bin/
13+
ro-crate-metadata.json

CITATIONS.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
- [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)
1414

15-
> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online].
16-
17-
- [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
15+
> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online].- [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
1816
1917
> Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.
2018

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) Espinosa-Carrasco J, Patel H, Wang C, Ewels P
3+
Copyright (c) The nf-core/chipseq team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
<source media="(prefers-color-scheme: dark)" srcset="docs/images/nf-core-chipseq_logo_dark.png">
44
<img alt="nf-core/chipseq" src="docs/images/nf-core-chipseq_logo_light.png">
55
</picture>
6-
</h1>
7-
8-
[![GitHub Actions CI Status](https://github.com/nf-core/chipseq/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/chipseq/actions/workflows/ci.yml)
6+
</h1>[![GitHub Actions CI Status](https://github.com/nf-core/chipseq/actions/workflows/ci.yml/badge.svg)](https://github.com/nf-core/chipseq/actions/workflows/ci.yml)
97
[![GitHub Actions Linting Status](https://github.com/nf-core/chipseq/actions/workflows/linting.yml/badge.svg)](https://github.com/nf-core/chipseq/actions/workflows/linting.yml)[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/chipseq/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX)
108
[![nf-test](https://img.shields.io/badge/unit_tests-nf--test-337ab7.svg)](https://www.nf-test.com)
119

@@ -29,15 +27,12 @@
2927

3028
<!-- TODO nf-core: Include a figure that guides the user through the major workflow steps. Many nf-core
3129
workflows use the "tube map" design for that. See https://nf-co.re/docs/contributing/design_guidelines#examples for examples. -->
32-
<!-- TODO nf-core: Fill in short bullet-pointed list of the default steps in the pipeline -->
33-
34-
1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))
35-
2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))
30+
<!-- TODO nf-core: Fill in short bullet-pointed list of the default steps in the pipeline -->1. Read QC ([`FastQC`](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/))2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))
3631

3732
## Usage
3833

3934
> [!NOTE]
40-
> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.
35+
> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow.Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.
4136
4237
<!-- TODO nf-core: Describe the minimum required steps to execute the pipeline, e.g. how to prepare samplesheets.
4338
Explain what rows and columns represent. For instance (please edit as appropriate):
@@ -94,9 +89,7 @@ For further information or help, don't hesitate to get in touch on the [Slack `#
9489
## Citations
9590

9691
<!-- TODO nf-core: Add citation for pipeline after first release. Uncomment lines below and update Zenodo doi and badge at the top of this file. -->
97-
<!-- If you use nf-core/chipseq for your analysis, please cite it using the following doi: [10.5281/zenodo.XXXXXX](https://doi.org/10.5281/zenodo.XXXXXX) -->
98-
99-
<!-- TODO nf-core: Add bibliography of tools and data used in your pipeline -->
92+
<!-- If you use nf-core/chipseq for your analysis, please cite it using the following doi: [10.5281/zenodo.XXXXXX](https://doi.org/10.5281/zenodo.XXXXXX) --><!-- TODO nf-core: Add bibliography of tools and data used in your pipeline -->
10093

10194
An extensive list of references for the tools used by the pipeline can be found in the [`CITATIONS.md`](CITATIONS.md) file.
10295

docs/output.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ The directories listed below will be created in the results directory after the
1212

1313
The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes data using the following steps:
1414

15-
- [FastQC](#fastqc) - Raw read QC
16-
- [MultiQC](#multiqc) - Aggregate report describing results and QC from the whole pipeline
15+
- [FastQC](#fastqc) - Raw read QC- [MultiQC](#multiqc) - Aggregate report describing results and QC from the whole pipeline
1716
- [Pipeline information](#pipeline-information) - Report metrics generated during the workflow execution
1817

1918
### FastQC
@@ -27,9 +26,7 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d
2726

2827
</details>
2928

30-
[FastQC](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/) gives general quality metrics about your sequenced reads. It provides information about the quality score distribution across your reads, per base sequence content (%A/T/G/C), adapter contamination and overrepresented sequences. For further reading and documentation see the [FastQC help pages](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/Help/).
31-
32-
### MultiQC
29+
[FastQC](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/) gives general quality metrics about your sequenced reads. It provides information about the quality score distribution across your reads, per base sequence content (%A/T/G/C), adapter contamination and overrepresented sequences. For further reading and documentation see the [FastQC help pages](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/Help/).### MultiQC
3330

3431
<details markdown="1">
3532
<summary>Output files</summary>
@@ -43,9 +40,7 @@ The pipeline is built using [Nextflow](https://www.nextflow.io/) and processes d
4340

4441
[MultiQC](http://multiqc.info) is a visualization tool that generates a single HTML report summarising all samples in your project. Most of the pipeline QC results are visualised in the report and further statistics are available in the report data directory.
4542

46-
Results generated by MultiQC collate pipeline QC from supported tools e.g. FastQC. The pipeline has special steps which also allow the software versions to be reported in the MultiQC output for future traceability. For more information about how to use MultiQC reports, see <http://multiqc.info>.
47-
48-
### Pipeline information
43+
Results generated by MultiQC collate pipeline QC from supported tools e.g. FastQC. The pipeline has special steps which also allow the software versions to be reported in the MultiQC output for future traceability. For more information about how to use MultiQC reports, see <http://multiqc.info>.### Pipeline information
4944

5045
<details markdown="1">
5146
<summary>Output files</summary>

docs/usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Several generic profiles are bundled with the pipeline which instruct the pipeli
130130
> [!IMPORTANT]
131131
> We highly recommend the use of Docker or Singularity containers for full pipeline reproducibility, however when this is not possible, Conda is also supported.
132132
133-
The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to check if your system is suported, please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation).
133+
The pipeline also dynamically loads configurations from [https://github.com/nf-core/configs](https://github.com/nf-core/configs) when it runs, making multiple config profiles for various institutional clusters available at run time. For more information and to check if your system is supported, please see the [nf-core/configs documentation](https://github.com/nf-core/configs#documentation).
134134

135135
Note that multiple profiles can be loaded, for example: `-profile test,docker` - the order of arguments is important!
136136
They are loaded in sequence, so later profiles can overwrite earlier profiles.

0 commit comments

Comments
 (0)