Skip to content

Commit 680d2ff

Browse files
authored
Merge branch 'dev' into bump-version-nf-snap
2 parents 2d2ee5e + 67146de commit 680d2ff

File tree

21 files changed

+60
-145
lines changed

21 files changed

+60
-145
lines changed

.editorconfig

-30
This file was deleted.

.github/workflows/update_components_template.yml

-46
This file was deleted.

.pre-commit-config.yaml

+20-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.9.5
3+
rev: v0.9.9
44
hooks:
55
- id: ruff # linter
66
args: [--fix, --exit-non-zero-on-fix] # sort imports and fix
@@ -11,13 +11,26 @@ repos:
1111
- id: prettier
1212
additional_dependencies:
1313
14-
15-
- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
16-
rev: "3.2.0"
14+
- repo: https://github.com/pre-commit/pre-commit-hooks
15+
rev: v5.0.0
1716
hooks:
18-
- id: editorconfig-checker
19-
alias: ec
20-
17+
- id: trailing-whitespace
18+
args: [--markdown-linebreak-ext=md]
19+
exclude: |
20+
(?x)^(
21+
.*\.snap$|
22+
nf_core/pipeline-template/subworkflows/.*|
23+
nf_core/pipeline-template/modules/.*|
24+
tests/pipelines/__snapshots__/.*
25+
)$
26+
- id: end-of-file-fixer
27+
exclude: |
28+
(?x)^(
29+
.*\.snap$|
30+
nf_core/pipeline-template/subworkflows/.*|
31+
nf_core/pipeline-template/modules/.*|
32+
tests/pipelines/__snapshots__/.*
33+
)$
2134
- repo: https://github.com/pre-commit/mirrors-mypy
2235
rev: "v1.15.0"
2336
hooks:

.prettierignore

-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ tests/data/pipeline_create_template_skip.yml
1212
# don't run on things handled by ruff
1313
*.py
1414
*.pyc
15-

.prettierrc.yml

+5
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

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Remove the on `pull_request_target` trigger and `pull_request` types from the download test. Also drop `push` triggers on other CI tests. ([#3399](https://github.com/nf-core/tools/pull/3399))
88
- Add nf-core template version badges to README ([#3396](https://github.com/nf-core/tools/pull/3396))
9+
- Add Bluesky badge to readme ([#3475](https://github.com/nf-core/tools/pull/3475))
910

1011
### Linting
1112

@@ -33,6 +34,10 @@
3334
- chore(deps): update python:3.12-slim docker digest to 34656cd ([#3450](https://github.com/nf-core/tools/pull/3450))
3435
- Remove Twitter from README ([#3454](https://github.com/nf-core/tools/pull/3454))
3536
- docs: fix contributing link in the main README ([#3459](https://github.com/nf-core/tools/pull/3459))
37+
- Cleanup: Removed Redundant if Condition ([#3468](https://github.com/nf-core/tools/pull/3468))
38+
- chore(deps): update gitpod/workspace-base docker digest to 7f35e40 ([#3473](https://github.com/nf-core/tools/pull/3473))
39+
- chore(deps): update python:3.12-slim docker digest to aaa3f8c ([#3474](https://github.com/nf-core/tools/pull/3474))
40+
- chore(deps): update pre-commit hook astral-sh/ruff-pre-commit to v0.9.9 ([#3470](https://github.com/nf-core/tools/pull/3470))
3641

3742
## [v3.2.0 - Pewter Pangolin](https://github.com/nf-core/tools/releases/tag/3.2.0) - [2025-01-27]
3843

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-slim@sha256:34656cd90456349040784165b9decccbcee4de66f3ead0a1168ba893455afd1e
1+
FROM python:3.12-slim@sha256:aaa3f8cb64dd64e5f8cb6e58346bdcfa410a108324b0f28f1a7cc5964355b211
22
33
description="Docker image containing requirements for nf-core/tools"
44

+1-1
Loading

nf_core/gitpod/gitpod.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# docker build -t gitpod:test -f nf_core/gitpod/gitpod.Dockerfile .
33

44
# See https://docs.renovatebot.com/docker/#digest-pinning for why a digest is used.
5-
FROM gitpod/workspace-base@sha256:12853f7c901eb2b677a549cb112c85f9679d18feb30093bcc63aa252540ecad9
5+
FROM gitpod/workspace-base@sha256:7f35e401405c38ebc1185dfc3d6c066f73a524e8b86641453ea4690cc5c24fb6
66

77
USER root
88

nf_core/pipeline-template/.editorconfig

-41
This file was deleted.

nf_core/pipeline-template/.github/workflows/ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ concurrency:
1818
jobs:
1919
test:
2020
name: "Run pipeline with test data (${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }})"
21-
# Only run on push if this is the nf-core dev branch (merged PRs)
22-
if: "${{{% endraw %} github.event_name != 'push' || (github.event_name == 'push' && github.repository == '{{ name }}') {% raw %}}}"
2321
runs-on: ubuntu-latest
2422
strategy:
2523
matrix:

nf_core/pipeline-template/.github/workflows/linting_comment.yml

+1-1
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@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed

0 commit comments

Comments
 (0)