Skip to content

Commit e92242e

Browse files
Merge pull request nf-core#1595 from nf-core/dev
Release 3.4.3
2 parents b5b766d + fc7b47e commit e92242e

File tree

162 files changed

+4086
-938
lines changed

Some content is hidden

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

162 files changed

+4086
-938
lines changed

.editorconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ indent_style = unset
2828
[/assets/email*]
2929
indent_size = unset
3030

31-
# ignore Readme
32-
[README.md]
33-
indent_style = unset
34-
35-
# ignore python
31+
# ignore python and markdown
3632
[*.{py,md}]
3733
indent_style = unset

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/sare
1818
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/sarek/tree/master/.github/CONTRIBUTING.md)
1919
- [ ] If necessary, also make a PR on the nf-core/sarek _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2020
- [ ] Make sure your code lints (`nf-core lint`).
21-
- [ ] Ensure the test suite passes (`nf-test test tests/ --verbose --profile +docker`).
21+
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
2222
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
2323
- [ ] Usage Documentation in `docs/usage.md` is updated.
2424
- [ ] Output Documentation in `docs/output.md` is updated.

.github/workflows/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
steps:
7272
- name: Check out pipeline code
73-
uses: actions/checkout@v4
73+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
7474

7575
- name: Hash Github Workspace
7676
id: hash_workspace
@@ -89,7 +89,7 @@ jobs:
8989
run: pip install --upgrade -r tests/requirements.txt
9090

9191
- name: Install Nextflow ${{ matrix.NXF_VER }}
92-
uses: nf-core/setup-nextflow@v1
92+
uses: nf-core/setup-nextflow@v2
9393
with:
9494
version: "${{ matrix.NXF_VER }}"
9595

@@ -214,6 +214,7 @@ jobs:
214214
- "23.04.0"
215215
- "latest-everything"
216216
exclude:
217+
- tags: "bcftools/annotate"
217218
- tags: "bcftools/concat"
218219
- tags: "bcftools/mpileup"
219220
- tags: "bcftools/sort"
@@ -223,7 +224,9 @@ jobs:
223224
- tags: "bwamem2/mem"
224225
- tags: "cat/cat"
225226
- tags: "cat/fastq"
227+
- tags: "cnvkit/antitarget"
226228
- tags: "cnvkit/batch"
229+
- tags: "cnvkit/reference"
227230
- tags: "deepvariant"
228231
- tags: "dragmap/align"
229232
- tags: "dragmap/hashtable"
@@ -243,9 +246,12 @@ jobs:
243246
- tags: "gatk4/mutect2"
244247
- tags: "gatk4spark/applybqsr"
245248
- tags: "gatk4spark/markduplicates"
249+
- tags: "gawk"
246250
- tags: "mosdepth"
247251
- tags: "multiqc"
252+
- tags: "ngscheckmate/ncm"
248253
- tags: "samblaster"
254+
- tags: "samtools/convert"
249255
- tags: "samtools/mpileup"
250256
- tags: "samtools/stats"
251257
- tags: "snpeff/snpeff"
@@ -274,7 +280,7 @@ jobs:
274280
java-version: "17"
275281

276282
- name: Install Nextflow ${{ matrix.NXF_VER }}
277-
uses: nf-core/setup-nextflow@v1
283+
uses: nf-core/setup-nextflow@v2
278284
with:
279285
version: "${{ matrix.NXF_VER }}"
280286

.github/workflows/download_pipeline.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ on:
1414
pull_request:
1515
types:
1616
- opened
17+
- edited
18+
- synchronize
1719
branches:
1820
- master
1921
pull_request_target:
@@ -28,11 +30,14 @@ jobs:
2830
runs-on: ubuntu-latest
2931
steps:
3032
- name: Install Nextflow
31-
uses: nf-core/setup-nextflow@v1
33+
uses: nf-core/setup-nextflow@v2
3234

33-
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
35+
- name: Disk space cleanup
36+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
37+
38+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
3439
with:
35-
python-version: "3.11"
40+
python-version: "3.12"
3641
architecture: "x64"
3742
- uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
3843
with:
@@ -65,7 +70,16 @@ jobs:
6570
- name: Inspect download
6671
run: tree ./${{ env.REPOTITLE_LOWERCASE }}
6772

68-
- name: Run the downloaded pipeline
73+
- name: Run the downloaded pipeline (stub)
74+
id: stub_run_pipeline
75+
continue-on-error: true
76+
env:
77+
NXF_SINGULARITY_CACHEDIR: ./
78+
NXF_SINGULARITY_HOME_MOUNT: true
79+
run: nextflow run ./${{ env.REPOTITLE_LOWERCASE }}/$( sed 's/\W/_/g' <<< ${{ env.REPO_BRANCH }}) -stub -profile test,singularity --outdir ./results
80+
- name: Run the downloaded pipeline (stub run not supported)
81+
id: run_pipeline
82+
if: ${{ job.steps.stub_run_pipeline.status == failure() }}
6983
env:
7084
NXF_SINGULARITY_CACHEDIR: ./
7185
NXF_SINGULARITY_HOME_MOUNT: true

.github/workflows/fix-linting.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# Use the @nf-core-bot token to check out so we can push later
16-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
16+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

@@ -32,9 +32,9 @@ jobs:
3232
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
3333

3434
# Install and run pre-commit
35-
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
35+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
3636
with:
37-
python-version: 3.11
37+
python-version: "3.12"
3838

3939
- name: Install pre-commit
4040
run: pip install pre-commit

.github/workflows/linting.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ jobs:
1414
pre-commit:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
17+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
1818

19-
- name: Set up Python 3.11
20-
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
19+
- name: Set up Python 3.12
20+
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
2121
with:
22-
python-version: 3.11
23-
cache: "pip"
22+
python-version: "3.12"
2423

2524
- name: Install pre-commit
2625
run: pip install pre-commit
@@ -32,14 +31,14 @@ jobs:
3231
runs-on: ubuntu-latest
3332
steps:
3433
- name: Check out pipeline code
35-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
34+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
3635

3736
- name: Install Nextflow
38-
uses: nf-core/setup-nextflow@v1
37+
uses: nf-core/setup-nextflow@v2
3938

40-
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
39+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
4140
with:
42-
python-version: "3.11"
41+
python-version: "3.12"
4342
architecture: "x64"
4443

4544
- name: Install dependencies
@@ -60,7 +59,7 @@ jobs:
6059

6160
- name: Upload linting log file artifact
6261
if: ${{ always() }}
63-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
62+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
6463
with:
6564
name: linting-logs
6665
path: |

.github/workflows/linting_comment.yml

Lines changed: 1 addition & 1 deletion
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@f6b0bace624032e30a85a8fd9c1a7f8f611f5737 # v3
14+
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3
1515
with:
1616
workflow: linting.yml
1717
workflow_conclusion: completed

.github/workflows/release-announcements.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: get topics and convert to hashtags
1313
id: get_topics
1414
run: |
15-
curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ' >> $GITHUB_OUTPUT
15+
echo "topics=$(curl -s https://nf-co.re/pipelines.json | jq -r '.remote_workflows[] | select(.full_name == "${{ github.repository }}") | .topics[]' | awk '{print "#"$0}' | tr '\n' ' ')" >> $GITHUB_OUTPUT
1616
1717
- uses: rzr/fediverse-action@master
1818
with:
@@ -25,13 +25,13 @@ jobs:
2525
2626
Please see the changelog: ${{ github.event.release.html_url }}
2727
28-
${{ steps.get_topics.outputs.GITHUB_OUTPUT }} #nfcore #openscience #nextflow #bioinformatics
28+
${{ steps.get_topics.outputs.topics }} #nfcore #openscience #nextflow #bioinformatics
2929
3030
send-tweet:
3131
runs-on: ubuntu-latest
3232

3333
steps:
34-
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
34+
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
3535
with:
3636
python-version: "3.10"
3737
- name: Install dependencies

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ testing*
1010
.nf-test*
1111
.nf-test/
1212
test-datasets/
13+
test.tap
14+
test.xml

.nf-core.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
repository_type: pipeline
2+
nf_core_version: "2.14.1"
23
lint:
34
actions_ci: False
45
files_exist:
56
- .github/workflows/awsfulltest.yml
67
- .github/workflows/awstest.yml
78
- conf/modules.config
8-
- lib/WorkflowMain.groovy
9-
- lib/NfcoreTemplate.groovy
10-
- lib/WorkflowSarek.groovy
119
files_unchanged:
1210
- .gitignore
1311
- .github/PULL_REQUEST_TEMPLATE.md
1412
- assets/nf-core-sarek_logo_light.png
1513
- docs/images/nf-core-sarek_logo_dark.png
1614
- docs/images/nf-core-sarek_logo_light.png
17-
- lib/NfcoreTemplate.groovy
18-
- lib/NfcoreSchema.groovy
15+
modules_config: False
1916
template_strings: False

0 commit comments

Comments
 (0)