Skip to content

Commit 9e09cf4

Browse files
authored
Merge branch 'dev' into precommit_largefiles
2 parents de649c4 + 4513429 commit 9e09cf4

256 files changed

Lines changed: 17237 additions & 6234 deletions

File tree

Some content is hidden

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

.devcontainer/build-devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# devcontainers/miniconda image based on debian (bookworm)
22
# see tags and images: https://mcr.microsoft.com/en-us/artifact/mar/devcontainers/miniconda/tags
3-
FROM mcr.microsoft.com/devcontainers/miniconda@sha256:b99720fe7bdce0346dc3c3ff54414ba78ff183d85a5a9d9a2e2e5775ce679347 AS build
3+
FROM mcr.microsoft.com/devcontainers/miniconda@sha256:68c1f6d7904f2d94ce54a43052155348bdcf1800d9f84e8b7fd367c85e688bf1 AS build
44

55
# copy this repo at current revision
66
COPY . /root/nfcore-tools/
@@ -27,7 +27,7 @@ RUN rm -f /etc/apt/sources.list.d/yarn.list && \
2727
rm -rf /var/lib/apt/lists/*
2828

2929
# Final stage to copy only the required files after installation
30-
FROM mcr.microsoft.com/devcontainers/base:2.1.6-debian12@sha256:15143a8c806afb8db57ae2c92876c112d7a6a1ced31cd7aa8b414201782757a4 AS final
30+
FROM mcr.microsoft.com/devcontainers/base:2.1.8-debian12@sha256:17e6cc517b483d1108b333d4c34352b0a21617f0117052e9b259d47113a9dc37 AS final
3131

3232
# Copy only the conda environment and site-packages from build stage
3333
COPY --from=build /opt/conda /opt/conda

.devcontainer/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export PS1='\[\e[3;36m\]\w ->\[\e[0m\\] '
1010
nextflow self-update
1111

1212
# Install specifically the version of tools from the workspace
13-
uv sync --all-extras
13+
uv sync
1414

1515
# Activate the virtual environment automatically on login
1616
echo "source $(pwd)/.venv/bin/activate" >> $HOME/.bashrc

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CHANGELOG.md merge=union

.github/actions/create-lint-wf/action.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
export NXF_WORK=$(pwd)
1717
1818
- name: Install Nextflow
19-
uses: nf-core/setup-nextflow@v2
19+
uses: nf-core/setup-nextflow@b4ec1bc7c16a94435159de94a05253542fddf6ef # v3
2020
with:
2121
version: ${{ matrix.NXF_VER }}
2222

@@ -40,34 +40,46 @@ runs:
4040
pwd
4141
ls -l
4242
working-directory: create-lint-wf/nf-core-testpipeline
43+
4344
# Run code style linting
44-
- name: run pre-commit
45+
- name: run prek
4546
shell: bash
46-
run: uv run pre-commit run --all-files
47-
working-directory: create-lint-wf
47+
run: uv run prek run --config .pre-commit-config.yaml --all-files
48+
working-directory: create-lint-wf/nf-core-testpipeline
4849

4950
# Update modules to the latest version
5051
- name: nf-core modules update
5152
shell: bash
5253
run: uv run nf-core --log-file log.txt modules update --dir nf-core-testpipeline --all --no-preview
5354
working-directory: create-lint-wf
5455

56+
# Commit regenerated container configs so lint sees them as up to date
57+
- name: commit updated container configs
58+
shell: bash
59+
run: |
60+
cd nf-core-testpipeline
61+
git config user.email "nf-core-bot@nf-co.re"
62+
git config user.name "nf-core-bot"
63+
git add conf/containers_*.config
64+
git diff --cached --quiet || git commit -m "Update container configs after modules update"
65+
working-directory: create-lint-wf
66+
5567
# Remove TODO statements
5668
- name: remove TODO
5769
shell: bash
58-
run: find nf-core-testpipeline -type f -exec sed -i 's#TODO nf-core:##g' {} \;
70+
run: find nf-core-testpipeline -not -path '*/.git/*' -type f -exec sed -i 's#TODO nf-core:##g' {} \;
5971
working-directory: create-lint-wf
6072

6173
# Uncomment includeConfig statement
6274
- name: uncomment include config
6375
shell: bash
64-
run: find nf-core-testpipeline -type f -exec sed -i 's/\/\/ includeConfig/includeConfig/' {} \;
76+
run: find nf-core-testpipeline -not -path '*/.git/*' -type f -exec sed -i 's/\/\/ includeConfig/includeConfig/' {} \;
6577
working-directory: create-lint-wf
6678

6779
# Replace zenodo.XXXXXX to pass readme linting
6880
- name: replace zenodo.XXXXXX
6981
shell: bash
70-
run: find nf-core-testpipeline -type f -exec sed -i 's/zenodo.XXXXXX/zenodo.123456/g' {} \;
82+
run: find nf-core-testpipeline -not -path '*/.git/*' -type f -exec sed -i 's/zenodo.XXXXXX/zenodo.123456/g' {} \;
7183
working-directory: create-lint-wf
7284

7385
# Run nf-core pipelines linting
@@ -88,7 +100,7 @@ runs:
88100

89101
- name: Upload log file artifact
90102
if: ${{ always() }}
91-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
103+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
92104
with:
93105
name: nf-core-log-file-${{ matrix.NXF_VER }}
94106
path: create-lint-wf/log.txt

.github/snapshots/gpu.nf.test.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
],
108108
"meta": {
109109
"nf-test": "0.9.3",
110-
"nextflow": "25.04.0"
110+
"nextflow": "25.10.4"
111111
},
112112
"timestamp": "2025-06-16T14:29:10.076573"
113113
}

.github/workflows/branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# If the above check failed, post a comment on the PR explaining the failure
1919
- name: Post PR comment
2020
if: failure()
21-
uses: mshick/add-pr-comment@ffd016c7e151d97d69d21a843022fd4cd5b96fe5 # v3
21+
uses: mshick/add-pr-comment@ec328af66588ab8f77cdeb2c264f14aba45bbf59 # v3
2222
with:
2323
message: |
2424
## This PR is against the `main` branch :x:

.github/workflows/changelog.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@ def _skip_existing_entry_for_this_pr(line: str, same_section: bool = True) -> st
135135
# If the line already contains a link to the PR, don't add it again.
136136
line = _skip_existing_entry_for_this_pr(line, same_section=False)
137137

138-
if (
139-
line.startswith("## ") and not line.strip() == "# nf-core/tools: Changelog"
140-
): # Version header, e.g. "## v2.12dev"
138+
if line.startswith("## ") and line.strip() != "# nf-core/tools: Changelog": # Version header, e.g. "## v2.12dev"
141139
print(f"Found version header: {line.strip()}")
142140
updated_lines.append(line)
143141

.github/workflows/changelog.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,23 @@ name: Update CHANGELOG.md
22
on:
33
issue_comment:
44
types: [created] # Add "@nf-core-bot changelog" as a PR comment to trigger this workflow.
5-
pull_request_target:
6-
types: [opened]
7-
branches:
8-
- dev
95

106
jobs:
117
update_changelog:
128
runs-on: ubuntu-latest
9+
if: contains(github.event.comment.body, '@nf-core-bot changelog')
1310

1411
steps:
1512
- name: branch-deploy
1613
id: branch-deploy
1714
if: github.event_name == 'issue_comment'
18-
uses: github/branch-deploy@fded0351b6b79f854b335c11b3d93063461dd288 # v11.1.2
15+
uses: github/branch-deploy@de4d10ee17c3117a2076aff489ba03fadf225f35 # v11.1.5
1916
with:
2017
trigger: "@nf-core-bot changelog"
2118
reaction: "eyes"
2219
stable_branch: "dev"
2320

24-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
21+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
2522
with:
2623
token: ${{ secrets.NF_CORE_BOT_AUTH_TOKEN }}
2724

@@ -31,14 +28,10 @@ jobs:
3128
env:
3229
GH_TOKEN: ${{ secrets.NF_CORE_BOT_AUTH_TOKEN }}
3330
run: |
34-
if [[ "${{ github.event_name }}" == "issue_comment" ]]; then
35-
PR_NUMBER="${{ github.event.issue.number }}"
36-
elif [[ "${{ github.event_name }}" == "pull_request_target" ]]; then
37-
PR_NUMBER="${{ github.event.pull_request.number }}"
38-
fi
31+
PR_NUMBER="${{ github.event.issue.number }}"
3932
gh pr checkout $PR_NUMBER
4033
41-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
34+
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
4235
with:
4336
python-version: "3.14"
4437

@@ -67,12 +60,12 @@ jobs:
6760
echo "changed=$file_changed" >> $GITHUB_OUTPUT
6861
6962
- name: Set up Python 3.14
70-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
63+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
7164
with:
7265
python-version: "3.14"
7366

7467
- name: Run pre-commit rules with prek
75-
uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2
68+
uses: j178/prek-action@e98a699c41eb69ab013a45817a0406469a748f8d # v2
7669
continue-on-error: true
7770
with:
7871
extra-args: --config .pre-commit-config.yaml --all-files
@@ -86,5 +79,5 @@ jobs:
8679
git config user.name "nf-core-bot"
8780
git add ${GITHUB_WORKSPACE}/CHANGELOG.md
8881
git status
89-
git commit -m "[automated] Update CHANGELOG.md"
82+
git commit -m "[automated] Update CHANGELOG.md [skip ci]"
9083
git push

.github/workflows/clean-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10
13+
- uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10
1414
with:
1515
stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days."
1616
stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment if it is still useful."

.github/workflows/codspeed.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: CodSpeed benchmarks
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- dev
8+
pull_request:
9+
# `workflow_dispatch` allows CodSpeed to trigger backtest
10+
# performance analysis in order to generate initial data.
11+
workflow_dispatch:
12+
13+
# Cancel if a newer run with the same workflow name is queued
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
16+
cancel-in-progress: true
17+
18+
permissions:
19+
contents: read
20+
id-token: write # for OpenID Connect authentication with CodSpeed
21+
22+
jobs:
23+
startup-benchmarks:
24+
name: Run start-up benchmarks
25+
runs-on: codspeed-macro
26+
steps:
27+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
28+
name: Check out source-code repository
29+
30+
- name: Set up Python
31+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
32+
with:
33+
python-version: "3.14"
34+
35+
- name: Install Nextflow
36+
uses: nf-core/setup-nextflow@b4ec1bc7c16a94435159de94a05253542fddf6ef # v3
37+
with:
38+
version: ${{ github.event.inputs.nextflow-version || matrix.nextflow-version }}
39+
40+
- name: Install uv
41+
uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
42+
with:
43+
enable-cache: true
44+
45+
- name: Install dependencies
46+
run: uv sync --all-extras
47+
48+
# Clone nf-core/modules into the local cache here, while network is
49+
# available. The modules-install benchmark then runs entirely offline
50+
# (no per-round fetch), so it stays deterministic even if the CodSpeed
51+
# step sandboxes network during measurement.
52+
- name: Warm nf-core/modules cache
53+
run: uv run python -c "from nf_core.modules.modules_repo import ModulesRepo; ModulesRepo()"
54+
55+
# These benchmarks spawn a fresh interpreter per round to measure
56+
# import/start-up cost, which CodSpeed's instruction-counting
57+
# "simulation" instrument can't see. Use "walltime" mode instead.
58+
- name: Run start-up benchmarks
59+
uses: CodSpeedHQ/action@f99becdce5e5d51fd556489ebef684f4ecfd6286 # v4.18.5
60+
with:
61+
mode: walltime
62+
run: uv run pytest benchmarks/test_startup_benchmarks.py --codspeed

0 commit comments

Comments
 (0)