Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
94ecd83
Post release version bump + changelog update
Mar 5, 2025
1f7c97e
Merge pull request #465 from nf-core/post-release-version-bump
jasmezz Mar 5, 2025
3d9fffa
Merge branch 'nf-core:master' into json-schema-improvements
andreirie Mar 24, 2025
a631806
Changed descriptions from 'nextflow_schema.json' and 'schema_input.js…
andreirie Mar 25, 2025
ed75e46
switch to self-hosted-runners
mashehu Mar 25, 2025
3b0faf6
Merge pull request #470 from nf-core/switch-to-self-hosted-runners
jfy133 Mar 25, 2025
e96be7b
Updated changelog
andreirie Mar 25, 2025
bd45649
Updated CHANGELOG.md
andreirie Mar 25, 2025
c83c2fc
bump changelog
andreirie Mar 26, 2025
6c9d13f
Bump changelog
andreirie Mar 26, 2025
6a2c09b
Fixed changelog
andreirie Mar 26, 2025
079f217
Fixed changelod
andreirie Mar 26, 2025
29c1fad
Merge pull request #469 from andreirie/json-schema-improvements
andreirie Mar 26, 2025
65fc49b
Fix fARGene config, update changelog
Apr 7, 2025
9c4fbbb
[automated] Fix code linting
nf-core-bot Apr 7, 2025
9aee323
Update notation
Apr 8, 2025
63673c4
Update ci.yml
Apr 8, 2025
40c0ef7
Merge branch 'fix-fargene' of github.com:nf-core/funcscan into fix-fa…
Apr 8, 2025
4442765
Update nf-test files
Apr 8, 2025
cf3a501
Merge pull request #471 from nf-core/fix-fargene
jasmezz Apr 9, 2025
2b34366
Add CODEOWNERs file
jfy133 Apr 30, 2025
7063ce2
Merge pull request #476 from nf-core/add-codeowners-file
jfy133 Apr 30, 2025
26ca22f
Template update for nf-core/tools version 3.2.1
nf-core-bot Apr 30, 2025
178bf4a
Merge branch 'dev' into nf-core-template-merge-3.2.1
jasmezz Apr 30, 2025
810ce2a
Fix space
jasmezz Apr 30, 2025
c119717
Update changelog
Apr 30, 2025
ced7c7d
Update nextflow.config
jfy133 May 7, 2025
0ad0147
Merge pull request #477 from nf-core/nf-core-template-merge-3.2.1
jfy133 May 22, 2025
29467b2
Update antiSMASH to v8 and drop now unrequired installation dir para…
jfy133 May 23, 2025
798f864
Apply suggestions from code review
jfy133 May 23, 2025
b0dda35
Update CHANGELOG.md
jfy133 May 23, 2025
3011865
Update labels and improve usage.md manual antismash database download…
jfy133 May 23, 2025
50a19e8
Merge branch 'update-antismash' of github.com:nf-core/funcscan into u…
jfy133 May 23, 2025
53bd265
[automated] Fix code linting
nf-core-bot May 23, 2025
615662b
Update abricate to fix inconsistent report contetns
jfy133 May 27, 2025
ac45fe2
Don't need to disambiguate
jfy133 May 27, 2025
472a4e6
Update changed snapshot
May 27, 2025
03c419f
update CHAGNELOG
jfy133 May 27, 2025
2731d5b
Merge pull request #479 from nf-core/update-abricate-fix
jfy133 May 27, 2025
3825d29
Template update for nf-core/tools version 3.3.1
nf-core-bot Jun 3, 2025
2d837a6
Merge branch 'dev' into nf-core-template-merge-3.3.1
Jun 11, 2025
50d395a
Increase shars to fix no-space-left error, fix linting
Jun 11, 2025
3e69559
Fix linting
Jun 11, 2025
bea6bb5
Apply suggestions from code review, update changelog
Jun 12, 2025
e006c16
[automated] Fix code linting
nf-core-bot Jun 12, 2025
6155b9c
Fix test names
Jun 12, 2025
5cca2ee
Merge branch 'nf-core-template-merge-3.3.1' of github.com:nf-core/fun…
Jun 12, 2025
0a0a077
Add `profile` to nf-test files
Jun 12, 2025
6804cec
Update snapshot for "test" profile to fix CI tests
Jun 12, 2025
f201977
Add mini test data fo antismash data
jfy133 Jun 13, 2025
acc8e45
Merge branch 'dev' into update-antismash
jfy133 Jun 13, 2025
b92a63a
[automated] Fix code linting
nf-core-bot Jun 13, 2025
3ad05ed
Remove duplicate NFT variables resulting in no display of results on GHA
jfy133 Jun 18, 2025
852b381
Updatenapshot
jfy133 Jun 18, 2025
3a013bf
Remove tag from full test for CI testing
jfy133 Jun 18, 2025
29721b3
Remove whole list of files in lieu of our more fine grained tests
jfy133 Jun 18, 2025
ed77570
Merge pull request #480 from nf-core/nf-core-template-merge-3.3.1
jfy133 Jun 18, 2025
52ac0f8
Merge branch 'dev' into update-antismash
jfy133 Jun 18, 2025
47f9d6c
rename full tests so don't get activated in normal CI tests
jfy133 Jun 18, 2025
f014d55
[automated] Fix code linting
nf-core-bot Jun 18, 2025
88b1a0b
Add vertical workflow diagram
Jun 27, 2025
d25e88e
Update changelog
Jun 27, 2025
3c5cd99
Visual improvement
Jun 27, 2025
58b74de
Fix file names
Jun 27, 2025
9baf714
Add space
Jun 27, 2025
75d1325
Template update for nf-core/tools version 3.3.2
nf-core-bot Jul 8, 2025
6f9f72f
Merge branch 'dev' into nf-core-template-merge-3.3.2
mashehu Jul 8, 2025
2f976d6
Add pipeline-level nf-test snapshots for antismash update
Jul 8, 2025
eb64b32
Fix taxonomy snapshot
Jul 8, 2025
8c56e10
Fix taxonomy nf-test
Jul 9, 2025
4d4cb78
[automated] Fix code linting
nf-core-bot Jul 9, 2025
5715428
Fix abricate module sync
Jul 9, 2025
6cdfc05
Apply suggestions from code review
jasmezz Jul 9, 2025
d9264a8
Merge pull request #478 from nf-core/update-antismash
jasmezz Jul 9, 2025
221265f
Merge branch 'dev' into nf-core-template-merge-3.3.2
jasmezz Jul 9, 2025
f414939
Fix linting (sync multiqc and ro-crate json)
Jul 9, 2025
fad920a
Keep DOI in Readme
jasmezz Jul 9, 2025
e5c7e35
Sync ro-crate json
Jul 9, 2025
7b457a3
Update changelog [skip ci]
Jul 9, 2025
41b59d9
We don't want to skip CI apparently...
Jul 9, 2025
5f5a228
Merge pull request #484 from nf-core/nf-core-template-merge-3.3.2
jasmezz Jul 9, 2025
f699706
Merge branch 'dev' into add-vertical-metro-workflow
jfy133 Jul 14, 2025
c9526fa
Merge pull request #482 from nf-core/add-vertical-metro-workflow
jasmezz Jul 14, 2025
ec0724a
Update argNorm citation as suggested by @Vedanth-Ramji
Jul 17, 2025
4dc9dd9
Update bibliography for multiqc report
Jul 17, 2025
1b262d1
Fix name
Jul 17, 2025
6d3f76b
Merge pull request #486 from nf-core/update-argnorm-citation
jasmezz Jul 18, 2025
b409e4a
fix code block in help text
mashehu Jul 28, 2025
0e7f3ff
Merge pull request #490 from nf-core/fix-code-block-rendering
jasmezz Jul 28, 2025
83606d7
Update RGI modules to 6.0.5
jfy133 Sep 3, 2025
d59393f
First 3 snapshot updatez
jfy133 Sep 3, 2025
1d3333e
Update remaining tests
jfy133 Sep 4, 2025
2ed5feb
Add HirSE badge to README
jfy133 Sep 5, 2025
0dd932b
Add debugging code to find out why out of space
jfy133 Sep 5, 2025
c080633
Also add a df
jfy133 Sep 5, 2025
23431f2
Reduce size of results/work by skipping other large database in test_…
jfy133 Sep 5, 2025
a38eb90
Remove workspace size debugging code
jfy133 Sep 5, 2025
1d819c8
Update RO crate
jfy133 Sep 5, 2025
820ffd9
Merge pull request #494 from nf-core/rgi-update
jfy133 Sep 5, 2025
2f5bfaf
Version bump for release
jfy133 Sep 17, 2025
675b5e5
Update workflow PNGs
jfy133 Sep 17, 2025
83613c1
[automated] Fix code linting
nf-core-bot Sep 17, 2025
3c85fe8
Update version in snapshot
jfy133 Sep 18, 2025
c84c53c
Update CHANGELOG.md [skip ci]
jasmezz Sep 18, 2025
02acf4e
Merge pull request #495 from nf-core/bump-version-3.0.0
jfy133 Sep 18, 2025
a4ba298
Update docs/usage.md
jfy133 Sep 19, 2025
c1db8d2
Fix conda CI errors
jasmezz Sep 19, 2025
17ab9f0
Update CHANGELOG.md
jasmezz Sep 19, 2025
34c8b3c
Merge pull request #498 from nf-core/fix-conda-ci-errors
jfy133 Sep 19, 2025
c779f8a
Apply suggestions from code review
jfy133 Sep 23, 2025
78e557f
Fix mistake in html
jfy133 Sep 23, 2025
b66d69f
Update AMRFINDERPLUS to latest (and thus latest version)
jfy133 Oct 4, 2025
aae69ac
Use larger runner for tests
jfy133 Oct 4, 2025
c3be6fd
Use larger runner
jfy133 Oct 4, 2025
f082be6
Update amrfinderplus and hAMRonization
jfy133 Oct 4, 2025
6ecdffb
Merge branch 'dev' of github.com:nf-core/funcscan into dev
jfy133 Oct 4, 2025
1b1a8fc
Apply suggestion from @jfy133
jfy133 Oct 4, 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
37 changes: 0 additions & 37 deletions .editorconfig

This file was deleted.

1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @jfy133 @jasmezz @Darcy220606
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ If you wish to contribute a new step, please use the following coding standards:
5. Add any new parameters to `nextflow_schema.json` with help text (via the `nf-core pipelines schema build` tool).
6. Add sanity checks and validation for all relevant parameters.
7. Perform local tests to validate that the new code works as expected.
8. If applicable, add a new test command in `.github/workflow/ci.yml`.
8. If applicable, add a new test in the `tests` directory.
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.
10. Add a description of the output files and if relevant any appropriate images from the MultiQC report to `docs/output.md`.

Expand Down
69 changes: 69 additions & 0 deletions .github/actions/get-shards/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: "Get number of shards"
description: "Get the number of nf-test shards for the current CI job"
inputs:
max_shards:
description: "Maximum number of shards allowed"
required: true
paths:
description: "Component paths to test"
required: false
tags:
description: "Tags to pass as argument for nf-test --tag parameter"
required: false
outputs:
shard:
description: "Array of shard numbers"
value: ${{ steps.shards.outputs.shard }}
total_shards:
description: "Total number of shards"
value: ${{ steps.shards.outputs.total_shards }}
runs:
using: "composite"
steps:
- name: Install nf-test
uses: nf-core/setup-nf-test@v1
with:
version: ${{ env.NFT_VER }}
- name: Get number of shards
id: shards
shell: bash
run: |
# Run nf-test with dynamic parameter
nftest_output=$(nf-test test \
--profile +docker \
$(if [ -n "${{ inputs.tags }}" ]; then echo "--tag ${{ inputs.tags }}"; fi) \
--dry-run \
--ci \
--changed-since HEAD^) || {
echo "nf-test command failed with exit code $?"
echo "Full output: $nftest_output"
exit 1
}
echo "nf-test dry-run output: $nftest_output"

# Default values for shard and total_shards
shard="[]"
total_shards=0

# Check if there are related tests
if echo "$nftest_output" | grep -q 'No tests to execute'; then
echo "No related tests found."
else
# Extract the number of related tests
number_of_shards=$(echo "$nftest_output" | sed -n 's|.*Executed \([0-9]*\) tests.*|\1|p')
if [[ -n "$number_of_shards" && "$number_of_shards" -gt 0 ]]; then
shards_to_run=$(( $number_of_shards < ${{ inputs.max_shards }} ? $number_of_shards : ${{ inputs.max_shards }} ))
shard=$(seq 1 "$shards_to_run" | jq -R . | jq -c -s .)
total_shards="$shards_to_run"
else
echo "Unexpected output format. Falling back to default values."
fi
fi

# Write to GitHub Actions outputs
echo "shard=$shard" >> $GITHUB_OUTPUT
echo "total_shards=$total_shards" >> $GITHUB_OUTPUT

# Debugging output
echo "Final shard array: $shard"
echo "Total number of shards: $total_shards"
111 changes: 111 additions & 0 deletions .github/actions/nf-test/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name: "nf-test Action"
description: "Runs nf-test with common setup steps"
inputs:
profile:
description: "Profile to use"
required: true
shard:
description: "Shard number for this CI job"
required: true
total_shards:
description: "Total number of test shards(NOT the total number of matrix jobs)"
required: true
paths:
description: "Test paths"
required: true
tags:
description: "Tags to pass as argument for nf-test --tag parameter"
required: false
runs:
using: "composite"
steps:
- name: Setup Nextflow
uses: nf-core/setup-nextflow@v2
with:
version: "${{ env.NXF_VERSION }}"

- name: Set up Python
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with:
python-version: "3.13"

- name: Install nf-test
uses: nf-core/setup-nf-test@v1
with:
version: "${{ env.NFT_VER }}"
install-pdiff: true

- name: Setup apptainer
if: contains(inputs.profile, 'singularity')
uses: eWaterCycle/setup-apptainer@main

- name: Set up Singularity
if: contains(inputs.profile, 'singularity')
shell: bash
run: |
mkdir -p $NXF_SINGULARITY_CACHEDIR
mkdir -p $NXF_SINGULARITY_LIBRARYDIR

- name: Conda setup
if: contains(inputs.profile, 'conda')
uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3
with:
auto-update-conda: true
conda-solver: libmamba
channels: conda-forge,bioconda
channel-priority: strict
conda-remove-defaults: true

- name: Run nf-test
shell: bash
env:
NFT_WORKDIR: ${{ env.NFT_WORKDIR }}
run: |
nf-test test \
--profile=+${{ inputs.profile }} \
$(if [ -n "${{ inputs.tags }}" ]; then echo "--tag ${{ inputs.tags }}"; fi) \
--ci \
--changed-since HEAD^ \
--verbose \
--tap=test.tap \
--shard ${{ inputs.shard }}/${{ inputs.total_shards }}

# Save the absolute path of the test.tap file to the output
echo "tap_file_path=$(realpath test.tap)" >> $GITHUB_OUTPUT

- name: Generate test summary
if: always()
shell: bash
run: |
# Add header if it doesn't exist (using a token file to track this)
if [ ! -f ".summary_header" ]; then
echo "# 🚀 nf-test results" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "| Status | Test Name | Profile | Shard |" >> $GITHUB_STEP_SUMMARY
echo "|:------:|-----------|---------|-------|" >> $GITHUB_STEP_SUMMARY
touch .summary_header
fi

if [ -f test.tap ]; then
while IFS= read -r line; do
if [[ $line =~ ^ok ]]; then
test_name="${line#ok }"
# Remove the test number from the beginning
test_name="${test_name#* }"
echo "| ✅ | ${test_name} | ${{ inputs.profile }} | ${{ inputs.shard }}/${{ inputs.total_shards }} |" >> $GITHUB_STEP_SUMMARY
elif [[ $line =~ ^not\ ok ]]; then
test_name="${line#not ok }"
# Remove the test number from the beginning
test_name="${test_name#* }"
echo "| ❌ | ${test_name} | ${{ inputs.profile }} | ${{ inputs.shard }}/${{ inputs.total_shards }} |" >> $GITHUB_STEP_SUMMARY
fi
done < test.tap
else
echo "| ⚠️ | No test results found | ${{ inputs.profile }} | ${{ inputs.shard }}/${{ inputs.total_shards }} |" >> $GITHUB_STEP_SUMMARY
fi

- name: Clean up
if: always()
shell: bash
run: |
sudo rm -rf /home/ubuntu/tests/
43 changes: 11 additions & 32 deletions .github/workflows/awsfulltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,61 +4,40 @@ name: nf-core AWS full size tests
# It runs the -profile 'test_full' on AWS batch

on:
pull_request:
branches:
- main
- master
workflow_dispatch:
pull_request_review:
types: [submitted]
release:
types: [published]

jobs:
run-platform:
name: Run AWS full tests
# run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
if: github.repository == 'nf-core/funcscan' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
# run only if the PR is approved by at least 2 reviewers and against the master/main branch or manually triggered
if: github.repository == 'nf-core/funcscan' && github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') || github.event_name == 'workflow_dispatch' || github.event_name == 'release'
runs-on: ubuntu-latest
steps:
- name: Get PR reviews
uses: octokit/[email protected]
if: github.event_name != 'workflow_dispatch'
id: check_approvals
continue-on-error: true
with:
route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Check for approvals
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
run: |
echo "No review approvals found. At least 2 approvals are required to run this action automatically."
exit 1

- name: Check for enough approvals (>=2)
id: test_variables
if: github.event_name != 'workflow_dispatch'
- name: Set revision variable
id: revision
run: |
JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT"

- name: Launch workflow via Seqera Platform
uses: seqeralabs/action-tower-launch@v2
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
revision: ${{ github.sha }}
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/funcscan/work-${{ github.sha }}
revision: ${{ steps.revision.outputs.revision }}
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/funcscan/work-${{ steps.revision.outputs.revision }}
parameters: |
{
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/funcscan/results-${{ github.sha }}"
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/funcscan/results-${{ steps.revision.outputs.revision }}"
}
profiles: test_full

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: Seqera Platform debug log file
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/awstest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
}
profiles: test

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: Seqera Platform debug log file
path: |
Expand Down
Loading
Loading