Skip to content

Commit 62ab267

Browse files
authored
Merge pull request #52 from nf-core/ci-interproscan
feat: Add interproscan_run param
2 parents c04b61e + f478094 commit 62ab267

24 files changed

Lines changed: 543 additions & 42 deletions

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ If you wish to contribute a new step, please use the following coding standards:
7878
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.
81-
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
81+
8. If applicable, add a new test in the `tests` directory.
8282
9. Update MultiQC config `assets/multiqc_config.yml` so relevant suffixes, file name clean up and module plots are in the appropriate order. If applicable, add a [MultiQC](https://https://multiqc.info/) module.
8383
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.
8484

.github/actions/nf-test/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ runs:
6969
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
7070
run: |
7171
nf-test test \
72+
--tag=CI \
7273
--profile=+${{ inputs.profile }} \
7374
--tap=test.tap \
7475
--verbose \

.github/workflows/linting.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: nf-core linting
33
# It runs the `nf-core pipelines lint` and markdown lint tests to ensure
44
# that the code meets the nf-core guidelines.
55
on:
6-
push:
7-
branches:
8-
- dev
96
pull_request:
107
release:
118
types: [published]
@@ -17,9 +14,9 @@ jobs:
1714
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1815

1916
- name: Set up Python 3.12
20-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
17+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
2118
with:
22-
python-version: "3.12"
19+
python-version: "3.13"
2320

2421
- name: Install pre-commit
2522
run: pip install pre-commit
@@ -36,13 +33,13 @@ jobs:
3633
- name: Install Nextflow
3734
uses: nf-core/setup-nextflow@v2
3835

39-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
36+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
4037
with:
41-
python-version: "3.12"
38+
python-version: "3.13"
4239
architecture: "x64"
4340

4441
- name: read .nf-core.yml
45-
uses: pietrobolcato/action-read-yaml@1.1.0
42+
uses: pietrobolcato/action-read-yaml@9f13718d61111b69f30ab4ac683e67a56d254e1d # 1.1.0
4643
id: read_yml
4744
with:
4845
config: ${{ github.workspace }}/.nf-core.yml
@@ -74,7 +71,7 @@ jobs:
7471

7572
- name: Upload linting log file artifact
7673
if: ${{ always() }}
77-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
74+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
7875
with:
7976
name: linting-logs
8077
path: |

.github/workflows/linting_comment.yml

Lines changed: 2 additions & 2 deletions
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@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8
14+
uses: dawidd6/action-download-artifact@4c1e823582f43b179e2cbb49c3eade4e41f992e2 # v10
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed
@@ -21,7 +21,7 @@ jobs:
2121
run: echo "pr_number=$(cat linting-logs/PR_number.txt)" >> $GITHUB_OUTPUT
2222

2323
- name: Post PR comment
24-
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2
24+
uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2
2525
with:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2727
number: ${{ steps.pr_number.outputs.pr_number }}

.github/workflows/nf-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jobs:
9494
NXF_VER:
9595
# renovate: datasource=github-releases depName=nextflow/nextflow versioning=semver
9696
- "24.10.2"
97+
- "24.04.2" # Absolute mininmum pipeline test version
9798
- "latest-everything"
9899
env:
99100
NXF_ANSI_LOG: false

.prettierrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
printWidth: 120
2+
tabWidth: 4
3+
overrides:
4+
- files: "*.{md,yml,yaml,html,css,scss,js,cff}"
5+
options:
6+
tabWidth: 2

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@
3030
<!-- TODO nf-core: Include a figure that guides the user through the major workflow steps. Many nf-core
3131
workflows use the "tube map" design for that. See https://nf-co.re/docs/contributing/design_guidelines#examples for examples. -->
3232
<!-- TODO nf-core: Fill in short bullet-pointed list of the default steps in the pipeline -->
33-
1. Functional Annotation
34-
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.
35-
1. Run ([`seqkit stats`](https://bioinf.shenwei.me/seqkit/usage/#stats)) to summarize input protein fasta files
36-
2. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))
37-
38-
![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)
3933

4034
1. Run ([`seqkit stats`](https://bioinf.shenwei.me/seqkit/usage/#stats)) to summarize input protein fasta files
41-
2. Functional Annotation
42-
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.
35+
2. Functional Annotation:
36+
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.
4337
3. Present QC for raw reads ([`MultiQC`](http://multiqc.info/))
4438

39+
![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)
40+
4541
## Usage
4642

4743
> [!NOTE]

conf/test.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ params {
2828
// From: https://github.com/nf-core/proteinfold/blob/1.1.1/conf/test.config
2929
// Example: https://github.com/nf-core/test-datasets/blob/proteinfold/testdata/samplesheet/v1.2/samplesheet.csv
3030
input = params.pipelines_testdata_base_path + 'proteinfold/testdata/samplesheet/v1.2/samplesheet.csv'
31+
run_interproscan = false
3132
}

conf/test_full.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ params {
1818
// TODO nf-core: Specify the paths to your full test data ( on nf-core/test-datasets or directly in repositories, e.g. SRA)
1919
// TODO nf-core: Give any required params for the test so that command line flags are not needed
2020
input = params.pipelines_testdata_base_path + 'proteinannotator/samplesheet/snap25-isoforms.csv'
21+
run_interproscan = true
2122
}

modules.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"https://github.com/nf-core/modules.git": {
66
"modules": {
77
"nf-core": {
8-
"mmseqs/search": {
8+
"interproscan": {
99
"branch": "master",
1010
"git_sha": "81880787133db07d9b4c1febd152c090eb8325dc",
1111
"installed_by": ["modules"]
1212
},
13-
"mtmalign/align": {
13+
"mmseqs/search": {
1414
"branch": "master",
15-
"git_sha": "c7cfb9446fb3098e525089198ff232d795c20ef2",
15+
"git_sha": "81880787133db07d9b4c1febd152c090eb8325dc",
1616
"installed_by": ["modules"]
1717
},
18-
"interproscan": {
18+
"mtmalign/align": {
1919
"branch": "master",
20-
"git_sha": "81880787133db07d9b4c1febd152c090eb8325dc",
20+
"git_sha": "c7cfb9446fb3098e525089198ff232d795c20ef2",
2121
"installed_by": ["modules"]
2222
},
2323
"multiqc": {

0 commit comments

Comments
 (0)