Skip to content

Commit 4016d20

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 2ad3c79 + 6da7216 commit 4016d20

File tree

4,951 files changed

+150035
-47764
lines changed

Some content is hidden

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

4,951 files changed

+150035
-47764
lines changed

.devcontainer/devcontainer.json

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
{
2-
"name": "nfcore",
3-
"image": "nfcore/gitpod:dev",
4-
"remoteUser": "gitpod",
5-
"runArgs": ["--privileged"],
6-
// Configure tool-specific properties.
7-
"customizations": {
8-
// Configure properties specific to VS Code.
9-
"vscode": {
10-
// Set *default* container specific settings.json values on container create.
11-
"settings": {
12-
"python.defaultInterpreterPath": "/opt/conda/bin/python",
13-
"python.linting.enabled": true
14-
},
2+
"name": "nfcore-modules",
3+
"image": "nfcore/devcontainer:dev",
154

16-
// Add the IDs of extensions you want installed when the container is created.
17-
"extensions": ["nf-core.nf-core-extensionpack"]
18-
}
5+
"remoteEnv": {
6+
// Workspace path on the host for mounting with docker-outside-of-docker
7+
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
198
},
20-
"features": {
21-
"ghcr.io/devcontainers/features/github-cli:1.0.11": {
22-
"digest": "sha256:464564228ccdd6028f01f8a62a3cfbaf76e9ba7953b29ac0e53ba2c262604312"
23-
},
24-
"ghcr.io/devcontainers/features/docker-in-docker:2.9.2": {
25-
"digest": "sha256:9074d8eaf4585ab1498c81a8762078992725614fc7a9cfafe799aa22717a6bbf"
26-
}
9+
10+
"onCreateCommand": "./.devcontainer/setup.sh",
11+
12+
"remoteUser": "root",
13+
"privileged": true,
14+
15+
"hostRequirements": {
16+
"cpus": 4,
17+
"memory": "16gb",
18+
"storage": "32gb"
2719
}
2820
}

.devcontainer/setup.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
# Customise the terminal command prompt
4+
echo "export PROMPT_DIRTRIM=2" >> $HOME/.bashrc
5+
echo "export PS1='\[\e[3;36m\]\w ->\[\e[0m\\] '" >> $HOME/.bashrc
6+
export PS1='\[\e[3;36m\]\w ->\[\e[0m\\] '
7+
8+
# Update Nextflow
9+
nextflow self-update
10+
11+
# Install prek hooks
12+
pip install prek
13+
prek install --install-hooks
14+
15+
# Update welcome message
16+
echo "Welcome to nf-core/modules devcontainer!" > /usr/local/etc/vscode-dev-containers/first-run-notice.txt

.editorconfig

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
1-
.github/workflows/** @nf-core/a-team
2-
tests/config @nf-core/a-team
1+
# Everything is OWNED by infrastructure and ops
2+
* @nf-core/infrastructure @nf-core/ops
3+
# Except for modules and subworkflows
4+
modules
5+
subworkflows
36

4-
# Opt-in
5-
modules/nf-core/bedtools/** @edmundmiller
6-
modules/nf-core/dragmap/** @edmundmiller
7-
modules/nf-core/ensemblvep/** @maxulysse
8-
modules/nf-core/gatk4/** @maxulysse
9-
modules/nf-core/homer/** @edmundmiller
10-
modules/nf-core/snpeff/** @maxulysse
11-
modules/nf-core/pints/caller/** @edmundmiller
12-
modules/nf-core/preseq/ccurve/** @edmundmiller
13-
modules/nf-core/preseq/lcextrap/** @edmundmiller
14-
subworkflows/nf-core/homer/** @edmundmiller
15-
modules/nf-core/**/Dockerfile @edmundmiller @maxulysse
16-
subworkflows/nf-core/abundance_differential_filter/** @pinin4fjords
17-
subworkflows/nf-core/fastq_qc_trim_filter_setstrandedness/** @pinin4fjords
7+
# Opt-in for specific modules, subworkflows or files
8+
Dockerfile @edmundmiller @maxulysse
9+
modules/nf-core/bwa/index @maxulysse
10+
modules/nf-core/bwa/mem @maxulysse
11+
modules/nf-core/bwamem2 @maxulysse
12+
modules/nf-core/bedtools @edmundmiller
1813
modules/nf-core/deseq2 @pinin4fjords
14+
modules/nf-core/dragmap @edmundmiller
15+
modules/nf-core/ensemblvep @maxulysse
16+
modules/nf-core/gatk4 @maxulysse
17+
modules/nf-core/gatk4spark @maxulysse
18+
modules/nf-core/homer @edmundmiller
1919
modules/nf-core/limma @pinin4fjords
20+
modules/nf-core/pints/caller @edmundmiller
21+
modules/nf-core/preseq/ccurve @edmundmiller
22+
modules/nf-core/preseq/lcextrap @edmundmiller
2023
modules/nf-core/shinyngs @pinin4fjords
24+
modules/nf-core/snpeff @maxulysse
25+
subworkflows/nf-core/archive_extract @maxulysse
26+
subworkflows/nf-core/abundance_differential_filter @pinin4fjords
27+
subworkflows/nf-core/fastq_qc_trim_filter_setstrandedness @pinin4fjords
28+
subworkflows/nf-core/homer @edmundmiller
29+
subworkflows/nf-core/vcf_annotate_ensemblvep @maxulysse
30+
subworkflows/nf-core/vcf_annotate_ensemblvep_snpeff @maxulysse
31+
subworkflows/nf-core/vcf_annotate_snpeff @maxulysse

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ inputs:
1717
runs:
1818
using: "composite"
1919
steps:
20-
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
20+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
2121
with:
2222
distribution: "temurin"
2323
java-version: "17"
@@ -28,9 +28,9 @@ runs:
2828
version: "${{ env.NXF_VERSION }}"
2929

3030
- name: Set up Python
31-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
31+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6
3232
with:
33-
python-version: "3.13"
33+
python-version: "3.14"
3434

3535
- name: Set up nf-test
3636
uses: nf-core/setup-nf-test@v1

.github/renovate.json5

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,25 @@
22
$schema: "https://docs.renovatebot.com/renovate-schema.json",
33
extends: [
44
"github>nf-core/ops//.github/renovate/default.json5",
5-
"github>nf-core/ops//.github/renovate/process_updaters.json5",
5+
// "github>nf-core/ops//.github/renovate/process_updaters.json5",
66
],
77
prHeader: "## WARNING\n - [ ] I have made sure to update the singularity and conda images",
88
packageRules: [
99
{
1010
matchDatasources: ["conda", "pypi", "docker"],
1111
automerge: false,
1212
},
13+
{
14+
matchManagers: [
15+
"github-actions",
16+
"npm",
17+
"pip_requirements",
18+
"pip_setup",
19+
],
20+
groupName: "Infrastructural dependencies",
21+
schedule: ["before 6am on Monday"],
22+
matchPackageNames: ["!/biocontainers/*/"],
23+
},
1324
],
1425
customManagers: [
1526
{

.github/skip_nf_test.json

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"conda": [
33
"modules/nf-core/angsd/gl",
44
"modules/nf-core/annotsv/installannotations",
5-
"modules/nf-core/backsub",
65
"modules/nf-core/bakta/bakta",
76
"modules/nf-core/bakta/baktadbdownload",
87
"modules/nf-core/bases2fastq",
98
"modules/nf-core/basicpy",
109
"modules/nf-core/bcl2fastq",
1110
"modules/nf-core/bclconvert",
11+
"modules/nf-core/braker3",
1212
"modules/nf-core/celesta",
1313
"modules/nf-core/cellpose",
1414
"modules/nf-core/cellranger/count",
@@ -18,15 +18,17 @@
1818
"modules/nf-core/cellranger/mkvdjref",
1919
"modules/nf-core/cellranger/multi",
2020
"modules/nf-core/cellranger/vdj",
21-
"modules/nf-core/cellrangerarc/mkref",
2221
"modules/nf-core/cellrangerarc/count",
23-
"modules/nf-core/cellrangerarc/mkgtf",
2422
"modules/nf-core/cellrangerarc/mkfastq",
23+
"modules/nf-core/cellrangerarc/mkgtf",
24+
"modules/nf-core/cellrangerarc/mkref",
25+
"modules/nf-core/cellrangeratac/count",
2526
"modules/nf-core/cellrangeratac/mkfastq",
2627
"modules/nf-core/cellrangeratac/mkref",
27-
"modules/nf-core/cellrangeratac/count",
2828
"modules/nf-core/checkqc",
2929
"modules/nf-core/coreograph",
30+
"modules/nf-core/ctatsplicing/prepgenomelib",
31+
"modules/nf-core/ctatsplicing/startocancerintrons",
3032
"modules/nf-core/custom/dumpsoftwareversions",
3133
"modules/nf-core/deepcell/mesmer",
3234
"modules/nf-core/deepsomatic",
@@ -36,12 +38,16 @@
3638
"modules/nf-core/deepvariant/postprocessvariants",
3739
"modules/nf-core/deepvariant/rundeepvariant",
3840
"modules/nf-core/deepvariant/vcfstatsreport",
41+
"subworkflows/nf-core/dia_proteomics_analysis",
42+
"modules/nf-core/diann",
3943
"modules/nf-core/doubletdetection",
4044
"modules/nf-core/fastk/fastk",
4145
"modules/nf-core/fastk/histex",
4246
"modules/nf-core/fastk/merge",
4347
"modules/nf-core/fcs/fcsadaptor",
4448
"modules/nf-core/fcs/fcsgx",
49+
"modules/nf-core/force/cube",
50+
"modules/nf-core/force/tileextent",
4551
"modules/nf-core/ganon/buildcustom",
4652
"modules/nf-core/ganon/classify",
4753
"modules/nf-core/ganon/report",
@@ -62,16 +68,15 @@
6268
"modules/nf-core/merquryfk/katgc",
6369
"modules/nf-core/merquryfk/merquryfk",
6470
"modules/nf-core/merquryfk/ploidyplot",
65-
"modules/nf-core/mitohifi/mitohifi",
6671
"modules/nf-core/mitohifi/findmitoreference",
72+
"modules/nf-core/mitohifi/mitohifi",
6773
"modules/nf-core/molkartgarage/clahe",
6874
"modules/nf-core/ncbitools/vecscreen",
6975
"modules/nf-core/parabricks",
70-
"modules/nf-core/purgedups/histplot",
7176
"modules/nf-core/purgedups/calcuts",
7277
"modules/nf-core/purgedups/getseqs",
78+
"modules/nf-core/purgedups/histplot",
7379
"modules/nf-core/purgedups/purgedups",
74-
"modules/nf-core/quartonotebook",
7580
"modules/nf-core/scimap/mcmicro",
7681
"modules/nf-core/scimap/spatiallda",
7782
"modules/nf-core/sentieon/bwaindex",
@@ -94,19 +99,27 @@
9499
"modules/nf-core/xeniumranger/relabel",
95100
"modules/nf-core/xeniumranger/rename",
96101
"modules/nf-core/xeniumranger/resegment",
102+
"modules/nf-core/opt/flip",
103+
"modules/nf-core/opt/track",
104+
"modules/nf-core/opt/stat",
105+
"subworkflows/nf-core/bam_tumor_normal_somatic_variant_calling_strelka",
97106
"subworkflows/nf-core/bcl_demultiplex",
98107
"subworkflows/nf-core/deepvariant",
99108
"subworkflows/nf-core/fasta_clean_fcs",
100109
"subworkflows/nf-core/fasta_newick_epang_gappa",
101110
"subworkflows/nf-core/fastq_align_bamcmp_bwa",
102111
"subworkflows/nf-core/fastq_align_bwa"
103112
],
104-
"docker": ["modules/nf-core/parabricks", "subworkflows/nf-core/deepvariant/tests/equality"],
113+
"docker": [
114+
"modules/nf-core/parabricks",
115+
"modules/nf-core/sparsesignatures",
116+
"subworkflows/nf-core/deepvariant/tests/equality"
117+
],
105118
"singularity": [
106119
"modules/nf-core/bases2fastq",
120+
"modules/nf-core/deepsomatic",
107121
"modules/nf-core/deepvariant/rundeepvariant",
108122
"modules/nf-core/deepvariant/vcfstatsreport",
109-
"modules/nf-core/deepsomatic",
110123
"modules/nf-core/parabricks",
111124
"modules/nf-core/universc",
112125
"subworkflows/nf-core/deepvariant/tests/equality"

.github/workflows/clean-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
issues: write
1212
pull-requests: write
1313
steps:
14-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
14+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
1515
with:
1616
stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an @nf-core/modules contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days."
1717
stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an @nf-core/modules contributor. Remove stale label or add a comment if it is still useful."
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Close wishlist issues"
2+
on:
3+
schedule:
4+
- cron: "0 0 * * 0" # Once a week
5+
workflow_dispatch:
6+
7+
jobs:
8+
clean-up:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
issues: write
12+
steps:
13+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10
14+
with:
15+
stale-issue-message: "This issue has been tagged as wishlist and no one has assigned themselves to it within a year. It will be closed in 10 days unless someone assigns themselves to it."
16+
close-issue-message: "This issue was closed because it has been tagged as wishlist and no one worked on it for over a year."
17+
days-before-stale: 346
18+
days-before-close: 10
19+
any-of-labels: "wishlist"

.github/workflows/fix-linting.yml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
# Use the @nf-core-bot token to check out so we can push later
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
17+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
1818
with:
1919
token: ${{ secrets.nf_core_bot_auth_token }}
2020

2121
# indication that the linting is being fixed
2222
- name: React on comment
23-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
23+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
2424
with:
2525
comment-id: ${{ github.event.comment.id }}
2626
reactions: eyes
@@ -32,35 +32,22 @@ jobs:
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
3434

35-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
36-
37-
- name: Install Prettier
38-
run: npm install -g prettier @prettier/plugin-php
39-
40-
# Check that we actually need to fix something
41-
- name: Run 'prettier --check'
42-
id: prettier_status
43-
run: |
44-
if prettier --check ${GITHUB_WORKSPACE}; then
45-
echo "::set-output name=result::pass"
46-
else
47-
echo "::set-output name=result::fail"
48-
fi
49-
- name: Run 'prettier --write'
50-
if: steps.prettier_status.outputs.result == 'fail'
51-
run: prettier --write ${GITHUB_WORKSPACE}
35+
- name: Run prek
36+
id: prek
37+
uses: j178/prek-action@v1
38+
continue-on-error: true
5239

5340
- name: Post nothing-to-do comment
54-
if: steps.prettier_status.outputs.result == 'pass'
55-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
41+
if: steps.prek.outcome == 'success'
42+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
5643
with:
5744
issue-number: ${{ github.event.issue.number }}
5845
body: |
5946
Nothing for me to do here! :shrug:
6047
This is probably because the linting errors come from `nf-core lint` and have to be fixed manually (or with `nf-core lint --fix`).
6148
6249
- name: Commit & push changes
63-
if: steps.prettier_status.outputs.result == 'fail'
50+
if: steps.prek.outcome == 'failure'
6451
run: |
6552
git config user.email "[email protected]"
6653
git config user.name "nf-core-bot"

0 commit comments

Comments
 (0)