Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
7041aea
Add interproscan
olgabot Mar 24, 2025
a64b602
Got test input to work
olgabot Mar 24, 2025
1f05fa1
Add Interproscan database
olgabot Mar 25, 2025
9748bb4
Add test interproscan database
olgabot Mar 25, 2025
e655f6b
Add interproscan call
olgabot Mar 25, 2025
23f6a40
Removing nf-core fastqc module
heuermh Mar 25, 2025
2afd15a
Fix lint errors
heuermh Mar 25, 2025
2a800e0
Remove fastqc references from docs
heuermh Mar 25, 2025
beb277d
Remove withName:FASTQC from modules.config
olgabot Mar 25, 2025
7e9487b
Don't validate single-ended-ness of fastas
olgabot Mar 25, 2025
6c4a51c
Removing nf-core fastqc module
heuermh Mar 25, 2025
f339534
Update example samplesheets
olgabot Mar 25, 2025
554b4b9
Update usage.md to show fasta files
olgabot Mar 25, 2025
f95c037
Add interproscan but not fastqc module
olgabot Mar 25, 2025
90dcb01
Add InterProScan to README
olgabot Mar 25, 2025
90b7b76
Add initial interproscan stub to output.md
olgabot Mar 25, 2025
5b4a02a
Remove .zip for interproscan multiqc
olgabot Mar 25, 2025
c6f8361
Use local interproscan database for now
olgabot Mar 26, 2025
88bee23
Use quay nf-core/interproscan container
olgabot Mar 26, 2025
157a292
Add local interproscan module
olgabot Mar 27, 2025
2ab00ca
Move interproscan databases into reference database group
olgabot Mar 27, 2025
42cb44d
Removing nf-core fastqc module
heuermh Mar 25, 2025
7aa973f
Fix meta
eweizy Mar 26, 2025
d18d639
Install diamond/blastp
eweizy Mar 26, 2025
b4e16e3
Create FUNCTIONAL_ANNOTATION subworkflow skeleton
eweizy Mar 26, 2025
1f4b3a7
Remove diamond/blastp
eweizy Mar 26, 2025
748a65a
Add newline
eweizy Mar 26, 2025
b00b5cb
Remove default and add fasta input
eweizy Mar 26, 2025
7011e81
Add nf-core seqkit/stats module
heuermh Mar 25, 2025
0a44adf
move seqkit conf to modules.config
heuermh Mar 27, 2025
bd36ce1
add seqkit stats to output.md
heuermh Mar 27, 2025
3def7c3
fix prettier error
heuermh Mar 27, 2025
a578834
update changelog
heuermh Mar 27, 2025
5716e68
fix typo
heuermh Mar 27, 2025
96d8528
Update CHANGELOG.md
heuermh Mar 27, 2025
bd67e4c
Update CHANGELOG.md
heuermh Mar 27, 2025
9f02310
fix prettier error
heuermh Mar 27, 2025
9529c0f
add interproscan, no fastqc
olgabot Mar 28, 2025
4e87af6
Removing nf-core fastqc module
heuermh Mar 25, 2025
8df456c
Add local interproscan module
olgabot Mar 27, 2025
bbe543c
Change type for interproscan database version
olgabot Mar 30, 2025
eb48bce
Run interproscan in functional annotation subworkflow
olgabot Mar 30, 2025
cbba046
Make multifasta for InterProScan to run each sample separately
olgabot Apr 1, 2025
8b2ec3d
Use bioconda/wave version and turn on scratch
olgabot Apr 1, 2025
fa731ab
Add snap25 test data for full
olgabot Apr 1, 2025
e57fbf3
Add interproscan section to nextflow
olgabot Apr 3, 2025
2cdb6c9
Add binary file for setting up interproscan database
olgabot Apr 3, 2025
19cfd2e
Make separate "setup" and "run" processes for InterProScan
olgabot Apr 4, 2025
8c38282
Make interproscan subworkflow
olgabot Apr 4, 2025
2e0e978
Try to get interproscan to run end to end
olgabot Apr 4, 2025
0e2fd6a
Use containerOptions to stage the interproscan data properly
olgabot Apr 15, 2025
6626a07
Adding tests for running interproscan
olgabot Apr 15, 2025
d99066b
Add setup command, still testing
olgabot Apr 15, 2025
dbafb01
Remove interproscan tests from parent directory, use child process fo…
olgabot Apr 15, 2025
7b3add3
nf-test config addition
olgabot Apr 15, 2025
7c0719d
Ignore nf test output
olgabot Apr 15, 2025
bc87d54
Add nf-core/untar module
olgabot Apr 15, 2025
e558345
Update modules json
olgabot Apr 15, 2025
99a4cd3
Working on interproscan setup tests
olgabot Apr 15, 2025
207e212
Trying to get nf-tests to work on Interproscan Setup, but can't figur…
olgabot Apr 15, 2025
b0ab2df
Trying to get subfolder of UNTAR'd Interproscan data
olgabot Apr 17, 2025
f595b15
Trying to figure out the untar thing
olgabot Apr 22, 2025
9221909
Testing local scripts with interproscan setup
olgabot Apr 22, 2025
b8d6287
Remove interproscan setup in favor of updating the interproscan.prope…
olgabot Apr 22, 2025
f63278e
Update snapshot, change interproscan properties
olgabot Apr 22, 2025
3f3ba95
Now testing full interproscan subworkflow
olgabot Apr 22, 2025
9f44f9b
Remove interproscan setup py file
olgabot Apr 22, 2025
0c85d74
Remove call to interproscan setup
olgabot Apr 22, 2025
60097d4
Interproscan workflow tests seem to work
olgabot Apr 22, 2025
d773779
rename nf-test CI to be more explicit
olgabot Apr 22, 2025
15d330c
try using setup-nf-test
olgabot Apr 22, 2025
8f290bf
Try adding jobs: and tests
olgabot Apr 22, 2025
accbefd
try nf-test action from nf-core/modules
olgabot Apr 22, 2025
121a41f
Try a frankenversion of the github actions
olgabot Apr 22, 2025
7214c11
Always use singularity
olgabot Apr 22, 2025
b1bc8d8
Add environment variables
olgabot Apr 22, 2025
91db590
Remove nft environment variables
olgabot Apr 22, 2025
c5b571b
remove filter
olgabot Apr 22, 2025
d8650ea
Remove the nf environment variables altogether
olgabot Apr 22, 2025
e2f4288
Remove slash after --ci
olgabot Apr 22, 2025
72bb310
Update nf test config to use base directory for finding tests
olgabot Apr 22, 2025
8b79972
Ignore autogenerated nf-test files
olgabot Apr 22, 2025
fd6fbd8
Add test summary to CI output
olgabot Apr 22, 2025
78c6629
Only run nf-test on interproscan for now
olgabot Apr 22, 2025
9489ea3
--tags -> --tag (singular)
olgabot Apr 22, 2025
a6298c5
Add "test" profile for nf-test
olgabot Apr 23, 2025
bc3829e
Move interproscan/run into interproscan since it's only one submodule
olgabot May 13, 2025
b9c6d95
Rename INTERPROSCAN_RUN -> INTERPROSCAN
olgabot May 13, 2025
9ef31e1
Remove _RUN from INTERPROSCAN (again!)
olgabot May 13, 2025
92fb718
Add working snapshot for INTERPROSCAN module
olgabot May 13, 2025
1c957d9
Remove unnecessary print statements
olgabot May 13, 2025
6f4d318
Add test config from Sarek with @maxulysse's help
olgabot May 13, 2025
ad0659b
Try new testing of interproscan subworkflow
olgabot May 13, 2025
bc406ca
Add default interproscan tar gz database
olgabot May 14, 2025
3dca0b6
Update Info for interproscan tar gz on schema
olgabot May 14, 2025
2a6579c
Remove interproscan db from input
olgabot May 14, 2025
944f8a2
Merge branch 'dev' into olgabot/add-interproscan
olgabot May 25, 2025
5bb831c
Add interproscan
olgabot Mar 24, 2025
f36bd80
Add Interproscan database
olgabot Mar 25, 2025
56a2527
Add interproscan call
olgabot Mar 25, 2025
f473fac
Removing nf-core fastqc module
heuermh Mar 25, 2025
f99bd9b
Add InterProScan to README
olgabot Mar 25, 2025
c6598d1
Add local interproscan module
olgabot Mar 27, 2025
c49c6f5
Removing nf-core fastqc module
heuermh Mar 25, 2025
6689f1f
Update CHANGELOG.md
heuermh Mar 27, 2025
863996c
add interproscan, no fastqc
olgabot Mar 28, 2025
a5b8403
Add local interproscan module
olgabot Mar 27, 2025
191a26d
Run interproscan in functional annotation subworkflow
olgabot Mar 30, 2025
18cc517
Make multifasta for InterProScan to run each sample separately
olgabot Apr 1, 2025
a99f680
Add snap25 test data for full
olgabot Apr 1, 2025
cc743f5
Add interproscan section to nextflow
olgabot Apr 3, 2025
08ecbb9
Make interproscan subworkflow
olgabot Apr 4, 2025
62163ba
Add much more comprehensive output docs for Interproscan
olgabot May 25, 2025
cb3938a
Fixed rogue interproscan module in modules.json
olgabot May 25, 2025
af68f16
ignore igenomes for linting
olgabot May 25, 2025
51d6f4c
remove reference genome options requirement from nextflow schema
olgabot May 25, 2025
6229e11
remove genome, igenome options from nextflow config
olgabot May 25, 2025
be8b0ca
Fix error created by merge conflict
olgabot May 25, 2025
72ac353
Remove duplicate interproscan options
olgabot May 25, 2025
f62f5ad
Move interproscan data for test config into nf-test
olgabot May 25, 2025
2a93e7c
Set defaults for interproscan tar gz
olgabot May 25, 2025
6cc4f19
update directory of interproscan database
olgabot Jun 3, 2025
e9c9c8a
Linting
olgabot Jun 3, 2025
0ef6a73
Add stub test for interproscan
olgabot Jun 3, 2025
5b6bdfe
Avoid unused variable warning
olgabot Jun 3, 2025
e528818
feat: Add interproscan_run param
edmundmiller Jun 3, 2025
073e2b8
ci: Add a CI tag for tests
edmundmiller Jun 3, 2025
2dce296
fix: Use nf-schema to check for interproscan parameters to enforce da…
edmundmiller Jun 3, 2025
9054631
chore: Bump interproscan ftp link
edmundmiller Jun 3, 2025
c04b61e
Update stub test for interproscan
olgabot Jun 3, 2025
29d2754
Run pre-commit
olgabot Jun 3, 2025
738c11f
Run precommit on README
olgabot Jun 3, 2025
28fc05f
Fix some pipeline linting
olgabot Jun 3, 2025
70f58a1
More autofixes for linting
olgabot Jun 3, 2025
695377e
Fix interproscan gz path in schema
olgabot Jun 3, 2025
ccc433a
Add params.pipelines_testdata_base_path to test config
olgabot Jun 3, 2025
deed289
Add "24.04.2" to nf-test.yml
olgabot Jun 3, 2025
f478094
Update nextflow.config for custom profiles for different institutions…
olgabot Jun 3, 2025
62ab267
Merge pull request #52 from nf-core/ci-interproscan
olgabot Jun 3, 2025
5e370ff
Template update for nf-core/tools version 3.3.1
nf-core-bot Jun 3, 2025
10aa074
Add RO crate fix for nf-core pipeline lint
olgabot Jun 3, 2025
327b2e3
Add tomato comment referencing https://buttondown.com/chhopsky
olgabot Jun 4, 2025
152f57b
Rename run_interproscan to skip_interproscan, to match rnaseq-style o…
olgabot Jun 4, 2025
cd2a27b
Fix ro-crate-metadata.json for linting
olgabot Jun 4, 2025
0581e49
Template update for nf-core/tools version 3.3.1
nf-core-bot Jun 3, 2025
3e2bf19
Add RO crate fix for nf-core pipeline lint
olgabot Jun 3, 2025
784967e
Fix precommit in tests/nextflow.config
olgabot Jun 3, 2025
339cd77
Merge branch 'dev' into olgabot/add-interproscan
olgabot Jun 4, 2025
3b55fa8
"nf-core pipelines lint --dir . --fix rocrate_readme_sync" .. again!
olgabot Jun 4, 2025
d586357
Add CI options to stub tests
olgabot Jun 4, 2025
7cb0ccf
Add changes since hackathon to changelog
olgabot Jun 4, 2025
ed3d71b
Add InterProcan, MMseqs2, mTM-Align to citations
olgabot Jun 4, 2025
069226e
Finish the "..." on the README.
olgabot Jun 4, 2025
deb02cb
Update usage
olgabot Jun 4, 2025
f4e7b13
Fix information about InterProScan database input in nextflow schema
olgabot Jun 4, 2025
636cdb9
Why do I have to keep doing "nf-core pipelines lint --dir . --fix ro…
olgabot Jun 4, 2025
4082f50
Delete problematic main.nf.test
olgabot Jun 4, 2025
4e75092
Add magic NFT_DIFF environment variables from @maxulysse https://gith…
olgabot Jun 13, 2025
7484c6b
Add printing file tree to get-shards action
olgabot Jun 24, 2025
e89105c
Double quotes instead of single quotes
olgabot Jun 24, 2025
c28582d
Update contents of interproscan module test
olgabot Jun 24, 2025
886723e
Move printing file tree to nf-test action instead of get-shards action
olgabot Jun 24, 2025
022751f
Increase depth of file tree printing to 6 (default is 5)
olgabot Jun 24, 2025
d9cfdc5
Increase depth to 10 to show EVERYTHING
olgabot Jun 24, 2025
19ee475
Ignore interproscan data fixtures from prettier
olgabot Jun 24, 2025
8cca8ff
Force add interproscan test fixture data
olgabot Jun 24, 2025
395e782
replace date strings in tsv, gff3 output files from interproscan modu…
olgabot Jun 24, 2025
d9b4bf4
Add tags: CI to nf-test.yml for 'run nf-test'
olgabot Jun 24, 2025
1287fc7
Add default outdir of `./results` for test config
olgabot Jun 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/actions/nf-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ inputs:
runs:
using: "composite"
steps:
- name: Print Modules Folder Tree
uses: jaywcjlove/github-action-folder-tree@main
with:
exclude: "node_modules|dist|.git|.husky"
path: ./modules
depth: 10
- name: Print Subworkflows Folder Tree
uses: jaywcjlove/github-action-folder-tree@main
with:
exclude: "node_modules|dist|.git|.husky"
path: ./subworkflows
depth: 10
- name: Setup Nextflow
uses: nf-core/setup-nextflow@v2
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/nf-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ concurrency:

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NFT_DIFF: "pdiff"
NFT_DIFF_ARGS: "--line-numbers --width 120 --expand-tabs=2"
NFT_VER: "0.9.2"
NFT_WORKDIR: "~"
NXF_ANSI_LOG: false
Expand Down Expand Up @@ -58,6 +60,7 @@ jobs:
NFT_VER: ${{ env.NFT_VER }}
with:
max_shards: 7
tags: CI

- name: debug
run: |
Expand Down Expand Up @@ -106,6 +109,7 @@ jobs:
profile: ${{ matrix.profile }}
shard: ${{ matrix.shard }}
total_shards: ${{ env.TOTAL_SHARDS }}
tags: CI
confirm-pass:
needs: [nf-test]
if: always()
Expand Down
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ testing*
*.pyc
null/

.nf-test/*
# Nextflow nf-tests output
.nf-test.log
.nf-test-*
.nf-test/tests
.nf-test-*.nf
.nf-test/*
4 changes: 3 additions & 1 deletion .nf-core.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
lint:
files_exist:
- .github/workflows/ci.yml
- conf/igenomes.config
- conf/igenomes_ignored.config
actions_ci: false
files_unchanged:
- assets/nf-core-proteinannotator_logo_light.png
- docs/images/nf-core-proteinannotator_logo_light.png
- docs/images/nf-core-proteinannotator_logo_dark.png
- .github/PULL_REQUEST_TEMPLATE.md
nf_core_version: 3.3.1
repository_type: pipeline

template:
author: Olga Botvinnik
description: The best protein annotation pipeline in the world. Protein fasta ->
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ testing*
*.pyc
bin/
ro-crate-metadata.json
**/Makefile
Makefile
modules/local/interproscan/tests/fixtures/interproscan_db/data
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ Initial release of nf-core/proteinannotator, created with the [nf-core](https://

### `Added`

- [[PR #52](https://github.com/nf-core/proteinannotator/pull/52)] Add option to turn off InterProScan for testing
- [[PR #51](https://github.com/nf-core/proteinannotator/pull/51)] Update to nf-core/tools v3.3.1
- [[PR #47](https://github.com/nf-core/proteinannotator/pull/47)] Update metromap with more tools added from [May 2025 Hackathon](https://nf-co.re/events/2025/hackathon-boston)
- [[PR #43](https://github.com/nf-core/proteinannotator/pull/44)] Add [mTM-Align](https://nf-co.re/modules/mtmalign_align/) and [MMseqs2 Search](https://nf-co.re/modules/mmseqs_search/) modules
- [[PR #42](https://github.com/nf-core/proteinannotator/pull/42)] Updated to `nf-test` on GitHub Actions and in the `PULL_REQUEST_TEMPLATE.md`
- [[PR #13](https://github.com/nf-core/proteinannotator/pull/13)] Add nf-core seqkit/stats module
- [[PR #9](https://github.com/nf-core/proteinannotator/pull/9)] Add [InterProScan](https://interproscan-docs.readthedocs.io/) module

### `Fixed`

Expand Down
12 changes: 12 additions & 0 deletions CITATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@

> 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.

- [InterProScan](https://academic.oup.com/bioinformatics/article/17/9/847/206564)

> Zdobnov, Evgeni M., and Rolf Apweiler. “InterProScan – an Integration Platform for the Signature-Recognition Methods in InterPro.” Bioinformatics 17, no. 9 (September 1, 2001): 847–48. https://doi.org/10.1093/bioinformatics/17.9.847.

- [MMseqs2](https://www.nature.com/articles/nbt.3988)

> Zdobnov, Evgeni M., and Rolf Apweiler. “InterProScan – an Integration Platform for the Signature-Recognition Methods in InterPro.” Bioinformatics 17, no. 9 (September 1, 2001): 847–48. https://doi.org/10.1093/bioinformatics/17.9.847.

- [mTM-align](https://academic.oup.com/bioinformatics/article/34/10/1719/4769500)

> Dong, Runze, Zhenling Peng, Yang Zhang, and Jianyi Yang. “mTM-Align: An Algorithm for Fast and Accurate Multiple Protein Structure Alignment.” Bioinformatics 34, no. 10 (May 15, 2018): 1719–25. https://doi.org/10.1093/bioinformatics/btx828.

## Software packaging/containerisation tools

- [Anaconda](https://anaconda.com)
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

## Introduction

**nf-core/proteinannotator** is a bioinformatics pipeline that ...
**nf-core/proteinannotator** is a bioinformatics pipeline that runs statistics of input protein fasta files and identifies the function of proteins based on their sequence data, using state-of-the-art protein annotation tools such as [InterProScan](https://interproscan-docs.readthedocs.io/).

<!-- TODO nf-core:
Complete this sentence with a 2-3 sentence summary of what types of data the pipeline ingests, a brief overview of the
Expand All @@ -34,7 +34,9 @@
<!-- TODO nf-core: Fill in short bullet-pointed list of the default steps in the pipeline -->

1. Run ([`seqkit stats`](https://bioinf.shenwei.me/seqkit/usage/#stats)) to summarize input protein fasta files
2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))
2. Functional Annotation:
1. ([`InterProScan`](https://interproscan-docs.readthedocs.io/en/v5/)) a software tool used to analyze protein sequences by scanning them against the signatures of protein families, domains, and sites in the [InterPro](https://www.ebi.ac.uk/interpro/) database, helping to identify their functional characteristics.
3. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))

![Protein annotator metromap. Protein fasta files are summarized with `seqkit stats`, then functionally annotated with InterProScan, DIAMOND-blastp, UniFire, and Kmerseek](assets/proteinannotator-metromap.excalidraw.png)

Expand Down
7 changes: 4 additions & 3 deletions conf/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@ process {
resourceLimits = [
cpus: 4,
memory: '15.GB',
time: '1.h'
time: '1.h',
]
}

params {
config_profile_name = 'Test profile'
config_profile_name = 'Test profile'
config_profile_description = 'Minimal test dataset to check pipeline function'

// Input data
// TODO nf-core: Specify the paths to your test data on nf-core/test-datasets
// TODO nf-core: Give any required params for the test so that command line flags are not needed
// From: https://github.com/nf-core/proteinfold/blob/1.1.1/conf/test.config
// Example: https://github.com/nf-core/test-datasets/blob/proteinfold/testdata/samplesheet/v1.2/samplesheet.csv
input = params.pipelines_testdata_base_path + 'proteinfold/testdata/samplesheet/v1.2/samplesheet.csv'
input = params.pipelines_testdata_base_path + 'proteinfold/testdata/samplesheet/v1.2/samplesheet.csv'
skip_interproscan = true
}
7 changes: 2 additions & 5 deletions conf/test_full.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,11 @@
*/

params {
config_profile_name = 'Full test profile'
config_profile_name = 'Full test profile'
config_profile_description = 'Full test dataset to check pipeline function'

// Input data for full size test
// TODO nf-core: Specify the paths to your full test data ( on nf-core/test-datasets or directly in repositories, e.g. SRA)
// TODO nf-core: Give any required params for the test so that command line flags are not needed
input = params.pipelines_testdata_base_path + 'viralrecon/samplesheet/samplesheet_full_illumina_amplicon.csv'

// Fasta references
fasta = params.pipelines_testdata_base_path + 'viralrecon/genome/NC_045512.2/GCF_009858895.2_ASM985889v3_genomic.200409.fna.gz'
input = params.pipelines_testdata_base_path + 'proteinannotator/samplesheet/snap25-isoforms.csv'
}
Loading