Skip to content

Commit aeb7fec

Browse files
committed
Merge branch 'release/1.2.5'
2 parents d9bbc74 + 6c948e7 commit aeb7fec

17 files changed

+1331
-355
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Initialize CodeQL
3030
uses: github/codeql-action/init@v2

.github/workflows/pack_cwls.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
python-version: [3.7, 3.8, 3.9]
17+
python-version: [3.8.x, 3.9.x]
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020
with:
2121
submodules: recursive
2222
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Install cwltool
@@ -36,7 +36,7 @@ jobs:
3636
run: |
3737
echo Validating packed workflows...
3838
find . -name '*__packed.cwl' | xargs -I file cwltool --debug --validate file
39-
- uses: EndBug/add-and-commit@v4
39+
- uses: EndBug/add-and-commit@v9.1.4
4040
with:
4141
ref: ${{ github.head_ref }}
4242
env:

.github/workflows/validate_cwls.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
python-version: [3.7, 3.8, 3.9]
15+
python-version: [3.8.x, 3.9.x]
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1818
with:
1919
submodules: recursive
2020
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v2
21+
uses: actions/setup-python@v5
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
- name: Install cwltool
2525
run: |
2626
python -m pip install toil[cwl]==5.7.1
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828
- name: Validate
2929
run: |
3030
pip install cwltool

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ ENV/
107107
#vscode
108108
.vscode/*
109109

110+
pv_vardict/pv_maf_processing.cwl

command_line_tools

Submodule command_line_tools updated 128 files

qc_collapsed_bam/qc_collapsed_bam_v2.0.cwl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -317,25 +317,25 @@ outputs:
317317
'sbg:y': 884.875
318318
- id: biometrics_major_plot
319319
outputSource:
320-
- biometrics_major_0_2_14/biometrics_major_plot
320+
- biometrics_major_0_2_15/biometrics_major_plot
321321
type: File?
322322
'sbg:x': 1482.3623046875
323323
'sbg:y': 1496.25
324324
- id: biometrics_major_json
325325
outputSource:
326-
- biometrics_major_0_2_14/biometrics_major_json
326+
- biometrics_major_0_2_15/biometrics_major_json
327327
type: File?
328328
'sbg:x': 1482.3623046875
329329
'sbg:y': 1603.125
330330
- id: biometrics_major_csv
331331
outputSource:
332-
- biometrics_major_0_2_14/biometrics_major_csv
332+
- biometrics_major_0_2_15/biometrics_major_csv
333333
type: File
334334
'sbg:x': 1482.3623046875
335335
'sbg:y': 1710
336336
- id: collapsed_biometrics_extract_pickle
337337
outputSource:
338-
- biometrics_extract_0_2_14/biometrics_extract_pickle
338+
- biometrics_extract_0_2_15/biometrics_extract_pickle
339339
type: File
340340
'sbg:x': 982.1435546875
341341
'sbg:y': 2214.5
@@ -397,7 +397,7 @@ steps:
397397
- id: input
398398
linkMerge: merge_nested
399399
source:
400-
- biometrics_extract_0_2_14/biometrics_extract_pickle
400+
- biometrics_extract_0_2_15/biometrics_extract_pickle
401401
- id: minor_threshold
402402
source: minor_threshold
403403
- id: prefix
@@ -414,15 +414,15 @@ steps:
414414
- id: biometrics_minor_json
415415
- id: biometrics_minor_plot
416416
- id: biometrics_minor_sites_plot
417-
run: ../command_line_tools/biometrics_minor/0.2.14/biometrics_minor.cwl
417+
run: ../command_line_tools/biometrics_minor/0.2.15/biometrics_minor.cwl
418418
'sbg:x': 982.1435546875
419419
'sbg:y': 1916.75
420420
- id: biometrics_sexmismatch
421421
in:
422422
- id: input
423423
linkMerge: merge_flattened
424424
source:
425-
- biometrics_extract_0_2_14/biometrics_extract_pickle
425+
- biometrics_extract_0_2_15/biometrics_extract_pickle
426426
- id: coverage_threshold
427427
source: coverage_threshold
428428
- id: prefix
@@ -435,15 +435,15 @@ steps:
435435
- id: biometrics_sexmismatch_csv
436436
- id: biometrics_sexmismatch_json
437437
run: >-
438-
../command_line_tools/biometrics_sexmismatch/0.2.14/biometrics_sexmismatch.cwl
438+
../command_line_tools/biometrics_sexmismatch/0.2.15/biometrics_sexmismatch.cwl
439439
'sbg:x': 982.1435546875
440440
'sbg:y': 1760.875
441-
- id: biometrics_major_0_2_14
441+
- id: biometrics_major_0_2_15
442442
in:
443443
- id: input
444444
linkMerge: merge_nested
445445
source:
446-
- biometrics_extract_0_2_14/biometrics_extract_pickle
446+
- biometrics_extract_0_2_15/biometrics_extract_pickle
447447
- id: major_threshold
448448
source: major_threshold
449449
- id: prefix
@@ -458,10 +458,10 @@ steps:
458458
- id: biometrics_major_csv
459459
- id: biometrics_major_json
460460
- id: biometrics_major_plot
461-
run: ../command_line_tools/biometrics_major/0.2.14/biometrics_major.cwl
461+
run: ../command_line_tools/biometrics_major/0.2.15/biometrics_major.cwl
462462
'sbg:x': 982.1435546875
463463
'sbg:y': 2079.625
464-
- id: biometrics_extract_0_2_14
464+
- id: biometrics_extract_0_2_15
465465
in:
466466
- id: sample_bam
467467
source: collapsed_bam
@@ -482,7 +482,7 @@ steps:
482482
source: collapsed_biometrics_extract_file_type
483483
out:
484484
- id: biometrics_extract_pickle
485-
run: ../command_line_tools/biometrics_extract/0.2.14/biometrics_extract.cwl
485+
run: ../command_line_tools/biometrics_extract/0.2.15/biometrics_extract.cwl
486486
'sbg:x': 351.4375
487487
'sbg:y': 1328.9375
488488
- id: getbasecountsmultisample_1_2_5

0 commit comments

Comments
 (0)