Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Remove plugins #1245

Merged
merged 228 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
228 commits
Select commit Hold shift + click to select a range
760e666
Nothing to see here.
mathiasbio Jun 9, 2023
3c62c64
comment out cadd for testing
mathiasbio Jun 9, 2023
c97cae2
correcting bug
mathiasbio Jun 9, 2023
b36419f
add missing function import
mathiasbio Jun 9, 2023
f712f13
fix pytest ini
mathiasbio Jun 13, 2023
a14d0f9
fixing qc workflow
mathiasbio Jun 13, 2023
13677bc
removing duplicate fixtures after merge
mathiasbio Jun 13, 2023
a327a76
correcting qc workflow to work with WGS cases too
mathiasbio Jun 13, 2023
f7327ee
add test for qc wgs workflow
mathiasbio Jun 13, 2023
ce9325c
add vcfdir to qc workflow
mathiasbio Jun 13, 2023
55d1630
fixing qc for wgs
mathiasbio Jun 13, 2023
55b0780
removed concatenation rule
mathiasbio Jun 13, 2023
f1df90f
fixing pytest
mathiasbio Jun 13, 2023
9db7778
removing duplicate and deprecated test functions
mathiasbio Jun 13, 2023
933301a
black reformat
mathiasbio Jun 14, 2023
6a4cc41
fixing bug in PON workflow
mathiasbio Jun 14, 2023
eb549f3
changing PON to use default sentieon alignment workflow, up to dedup
mathiasbio Jun 14, 2023
edda0c3
adding sentieon env variables
mathiasbio Jun 14, 2023
a52f564
remove deprecated function
mathiasbio Jun 14, 2023
136286f
remove deprecated variables
mathiasbio Jun 14, 2023
ae2a089
fixing bug
mathiasbio Jun 14, 2023
d22ba0e
fixing bug
mathiasbio Jun 14, 2023
ba0cf0e
removing tmp from input umi
mathiasbio Jun 14, 2023
5e7269b
refactor and fix qcworkflow bug
mathiasbio Jun 27, 2023
99b2409
fix bug
mathiasbio Jun 27, 2023
90dc14d
add new fixtures for new tests
mathiasbio Jun 28, 2023
3e44042
refactor code
mathiasbio Jun 28, 2023
63360b6
refactor and cleanup
mathiasbio Jun 28, 2023
79ae219
add new tests
mathiasbio Jun 28, 2023
fd7d5f8
black
mathiasbio Jun 28, 2023
40f3a7f
refactor test
mathiasbio Jun 28, 2023
c179430
refactor function to reduce cognitive complexity
mathiasbio Jun 28, 2023
3024530
refactor
mathiasbio Jun 29, 2023
14beeba
adding more pytests for new functionality
mathiasbio Jun 30, 2023
5d0475f
refactor error reporting
mathiasbio Jul 19, 2023
ffd78dc
solving merge conflicts
mathiasbio Jul 20, 2023
f4a61ef
fixing pytests after merge
mathiasbio Jul 20, 2023
a6a762c
removed unnecessary config file
mathiasbio Jul 20, 2023
6a1c810
black
mathiasbio Jul 20, 2023
ffed28f
moved get analysis fastq-dir
mathiasbio Jul 20, 2023
d5d2791
moved fastq test names into a separate json file
mathiasbio Jul 22, 2023
296d9b2
added test for illegal samplename
mathiasbio Jul 22, 2023
84a8676
added sampletype to mosdepth output in order to have sampletype in mu…
mathiasbio Jul 22, 2023
c6de58e
black
mathiasbio Jul 22, 2023
2a9ad8f
fixing docstrings
mathiasbio Jul 22, 2023
f82b2a2
black
mathiasbio Jul 22, 2023
bb1b7b1
fixing typehint error
mathiasbio Jul 24, 2023
074e839
fixing codesmell
mathiasbio Jul 24, 2023
0f3fd1b
add instructions for fastq format for PON creation
mathiasbio Jul 24, 2023
7650790
remove duplicate rows
mathiasbio Jul 24, 2023
e5f51fc
moved the creation of the required toml output file to outside the if…
mathiasbio Jul 25, 2023
d4a7183
Merge branch 'develop' into core_pipeline_restructuring
mathiasbio Jul 25, 2023
411efc8
change dedup to markdup
mathiasbio Jul 25, 2023
6261d2e
removing rmdup flag
mathiasbio Jul 25, 2023
656f360
fix mosdepth output filename
mathiasbio Jul 26, 2023
8f89d19
added descriptive comment for sample field parsing
mathiasbio Jul 28, 2023
f0019e9
move validate fastq info from cli function in config case to pydantic…
mathiasbio Jul 28, 2023
f46cf45
correcting validators
mathiasbio Jul 28, 2023
4d4262b
added balsamic model initialization in run
mathiasbio Jul 28, 2023
0d8bdf0
refactoring based on code review
mathiasbio Jul 30, 2023
fcec7f5
refactor based on code review feedback
mathiasbio Jul 31, 2023
c04d055
updating code based on reviews
mathiasbio Aug 1, 2023
28cf4df
making changes based on codereview
mathiasbio Aug 4, 2023
383502e
reformat PON functions, added check for minimum PON samples detected
mathiasbio Aug 4, 2023
39d017f
adding fwd and rev to constants and replacing strings
mathiasbio Aug 4, 2023
bbc92f5
removed unnecessary check
mathiasbio Aug 4, 2023
502fd10
adding doc strings
mathiasbio Aug 4, 2023
9d6910d
refactor code to use balsamic model instead of sample dict
mathiasbio Aug 7, 2023
9d36227
continued refactoring to move away from using sampledict to pydantic …
mathiasbio Aug 8, 2023
8924827
refactoring for pon
mathiasbio Aug 8, 2023
5375f7c
fix bug in UMI rule
mathiasbio Aug 8, 2023
9f903fe
solving merge conflicts and updating to develop
mathiasbio Aug 8, 2023
9e6628f
fix bug
mathiasbio Aug 8, 2023
d41a52a
refactor, add parent class instead of mixin class
mathiasbio Aug 10, 2023
99607b7
add new pytests for analysis model class
mathiasbio Aug 10, 2023
baae864
add test files for pon workflow
mathiasbio Aug 10, 2023
6691bf9
fix pytests and remove unnecessary functions
mathiasbio Aug 10, 2023
2394c3b
fixing pytests
mathiasbio Aug 11, 2023
a494a8c
fixing pytest and removing canfam, they were never tested properly ve…
mathiasbio Aug 11, 2023
e8483d0
fix pytests
mathiasbio Aug 14, 2023
dac5a22
black and code-smells
mathiasbio Aug 14, 2023
63e8bde
removed merge bam rules
mathiasbio Aug 14, 2023
7773f3f
refactor include rules in qc workflow
mathiasbio Aug 14, 2023
ded6618
refactor fastq patterns
mathiasbio Aug 15, 2023
6d67d31
refactor based on code review
mathiasbio Aug 15, 2023
2a66a6e
remove unused rule
mathiasbio Aug 15, 2023
7f2620f
code refactor and bug fix
mathiasbio Aug 15, 2023
f0fafaa
refactor
mathiasbio Aug 15, 2023
1f9a693
cleaning up wildcards in umi workflow
mathiasbio Aug 16, 2023
14425cd
CHANGING and refactoring fastp rules
mathiasbio Aug 16, 2023
c687709
fix bugs
mathiasbio Aug 16, 2023
4e145bb
modify cluster threads for new fastp rules
mathiasbio Aug 16, 2023
cf06975
updated changelog
mathiasbio Aug 16, 2023
fa023d6
fix bug
mathiasbio Aug 16, 2023
dc1fe91
fix bug
mathiasbio Aug 16, 2023
bd67e81
Add init container versions
ivadym Aug 17, 2023
50ac9ca
CHANGELOG
ivadym Aug 17, 2023
e660b97
Merge develop
ivadym Aug 17, 2023
e018640
Rename option
ivadym Aug 17, 2023
f66d83c
Update cache folder
ivadym Aug 17, 2023
a423508
refactor fastqc rule to run once per fastq file
mathiasbio Aug 17, 2023
cc00795
Develop folder
ivadym Aug 17, 2023
affe45a
refactor code
mathiasbio Aug 17, 2023
8ed4a82
Merge branch 'develop' of github.com:Clinical-Genomics/BALSAMIC into …
ivadym Aug 17, 2023
7c22285
test data changes
mathiasbio Aug 17, 2023
1ed0e9d
Missing ignored link
ivadym Aug 17, 2023
cdb8374
Undo URL check
ivadym Aug 17, 2023
be2ccda
solve merge conflicts with develop
mathiasbio Aug 17, 2023
5875039
add required dummy test directories
mathiasbio Aug 18, 2023
b06b489
black
mathiasbio Aug 18, 2023
1c1b1a2
Merge branch 'develop' into init-containers
ivadym Aug 18, 2023
40fd319
fixing bug and adding pytest
mathiasbio Aug 20, 2023
9f5a893
fix bug and refactor balsamic model name
mathiasbio Aug 20, 2023
0a23884
fix bug
mathiasbio Aug 20, 2023
b328dd1
fix bug
mathiasbio Aug 21, 2023
9d098a5
remove unnecessary rule from QC workflow
mathiasbio Aug 21, 2023
963c9c3
refactor fastp trimming parameters
mathiasbio Aug 21, 2023
7d073bb
Update BALSAMIC/snakemake_rules/quality_control/samtools_qc.rule
mathiasbio Aug 21, 2023
c1e6b02
refactor code
mathiasbio Aug 21, 2023
e7ed6a1
Merge branch 'core_pipeline_restructuring' of github.com:Clinical-Gen…
mathiasbio Aug 21, 2023
eaee328
refactor function in model
mathiasbio Aug 21, 2023
7c5aa6b
add docstrings
mathiasbio Aug 21, 2023
d1b5718
refactor and fix pytests
mathiasbio Aug 21, 2023
34855de
fix bugs and pytests
mathiasbio Aug 22, 2023
7c02688
black
mathiasbio Aug 22, 2023
9ce5491
add pytest for get fastqs
mathiasbio Aug 22, 2023
0884565
add new pytest
mathiasbio Aug 22, 2023
98cb0f5
add new and correct old pytests
mathiasbio Aug 22, 2023
98259dc
black
mathiasbio Aug 22, 2023
8fc7cd7
Merge branch 'develop' into init-containers
ivadym Aug 22, 2023
5fee66e
add pytest for get fastp parameter
mathiasbio Aug 22, 2023
498098a
black
mathiasbio Aug 22, 2023
5ae646e
add typehints
mathiasbio Aug 22, 2023
e0b9c29
import pon model
mathiasbio Aug 22, 2023
a73c7f4
remove requirement that samplenames cannot contain underscores
mathiasbio Aug 22, 2023
cedbc59
Merge branch 'develop' into core_pipeline_restructuring
mathiasbio Aug 22, 2023
eb9a16a
black
mathiasbio Aug 22, 2023
530897c
refactoring cram compress rules
mathiasbio Aug 22, 2023
751379a
remove if statement
mathiasbio Aug 22, 2023
604de63
remove if statement
mathiasbio Aug 22, 2023
1c5ef8a
move dedup stats to qc dir and modify to make multiqc pick it up
mathiasbio Aug 22, 2023
af33331
fix bug
mathiasbio Aug 22, 2023
db0c500
remove try except
mathiasbio Aug 22, 2023
3948d26
black
mathiasbio Aug 22, 2023
670ffe8
Update cache-version option
ivadym Aug 23, 2023
bc7e886
--amend
ivadym Aug 23, 2023
af73bc6
pass click parameters
ivadym Aug 23, 2023
2f56855
URL ignore
ivadym Aug 23, 2023
6edc21f
Remove unused imports
ivadym Aug 23, 2023
72e0a7b
Remove unused methods
ivadym Aug 23, 2023
4ba62dd
Update constant
ivadym Aug 23, 2023
bbbe946
Use constant :o
ivadym Aug 23, 2023
1dbd940
Update init case ID
ivadym Aug 23, 2023
b637e5e
Update base
ivadym Aug 24, 2023
08acc24
add sentieon realign bam to deliverable rules
mathiasbio Aug 24, 2023
9e748f2
fix name
mathiasbio Aug 24, 2023
4e5382d
try new format
mathiasbio Aug 24, 2023
341aacd
new try...
mathiasbio Aug 24, 2023
a9e98b1
switch from bam to cram
mathiasbio Aug 24, 2023
91b7c59
refactor creation of log, script, and benchmark dirs
mathiasbio Aug 25, 2023
2e2b7be
refactoring code
mathiasbio Aug 28, 2023
53399a7
refactor code
mathiasbio Aug 30, 2023
127dacf
refactor code
mathiasbio Aug 30, 2023
39ff6a9
merge pon and regular analysis models
mathiasbio Aug 30, 2023
5eb5e64
code refactor
mathiasbio Aug 30, 2023
7fcb9d9
delete test-directories and creating them in conftest fixtures instead
mathiasbio Aug 30, 2023
e9feb72
refactor code
mathiasbio Aug 30, 2023
ba019d4
using fastq_path from analysis instead of function
mathiasbio Aug 31, 2023
b366173
refactor to use pathlib instead of os.join
mathiasbio Aug 31, 2023
660c503
fix small bug
mathiasbio Sep 4, 2023
dc4a440
change fastq paths from resolved to relative path to keep symlink path
mathiasbio Sep 4, 2023
f2aedde
revert to old path
mathiasbio Sep 4, 2023
3211602
solve merge conflicts, merupdating to latest develop
mathiasbio Sep 4, 2023
7aca1f3
adding dummy cadd file
mathiasbio Sep 4, 2023
bc3cfc8
black
mathiasbio Sep 4, 2023
e4ce0a3
fix codesmells
mathiasbio Sep 5, 2023
d08e5bc
fix codesmells
mathiasbio Sep 5, 2023
17465d0
refactor
mathiasbio Sep 5, 2023
5edd2db
refactor
mathiasbio Sep 5, 2023
2d51323
black
mathiasbio Sep 5, 2023
33b568c
fix bug
mathiasbio Sep 5, 2023
dcd4413
delete double slash in pon workflow
mathiasbio Sep 5, 2023
ad1fa0b
Logging level
ivadym Sep 6, 2023
418a253
changelog
ivadym Sep 6, 2023
fd768ae
Merge parent branch
ivadym Sep 6, 2023
a4c6b1f
Black
ivadym Sep 6, 2023
4ac9b04
Typos
ivadym Sep 6, 2023
ed43bbb
LOG LEVEL
ivadym Sep 6, 2023
d9674fa
Fix dictionary creation
ivadym Sep 6, 2023
ffb876b
Move log level
ivadym Sep 6, 2023
0deeaee
Update report options
ivadym Sep 6, 2023
464da0b
fix pon workflow bug
mathiasbio Sep 6, 2023
8120906
Update config case
ivadym Sep 7, 2023
68213fa
Update config case PON
ivadym Sep 7, 2023
8372797
Merge branch 'core_pipeline_restructuring' of github.com:Clinical-Gen…
ivadym Sep 7, 2023
b00291f
Reuse GenomeVersion option
ivadym Sep 7, 2023
63038a8
Update run analysis options
ivadym Sep 7, 2023
ab6a291
Order alphabetically
ivadym Sep 7, 2023
93c824f
Group CLI options
ivadym Sep 7, 2023
98ec6d5
Alphabetical order :p
ivadym Sep 7, 2023
4cd2439
Remove containers version
ivadym Sep 7, 2023
c3199e8
Changelog
ivadym Sep 7, 2023
0febf68
Typo
ivadym Sep 7, 2023
c19ff62
Docs
ivadym Sep 7, 2023
f658e61
convert str to Path
mathiasbio Sep 7, 2023
f67ebaf
Pathlib
ivadym Sep 7, 2023
031c4d0
remove dummy cadd
mathiasbio Sep 8, 2023
964d6a6
merging develop
mathiasbio Sep 8, 2023
0aae96d
refactor
mathiasbio Sep 8, 2023
b6543c6
Move cache logic
ivadym Sep 8, 2023
b53d640
added item to changelog
mathiasbio Sep 8, 2023
e59fca9
Merge branch 'core_pipeline_restructuring' into cache-version-analysis
ivadym Sep 8, 2023
ca0ed43
Merge branch 'cache-version-analysis' into run-cache-version
ivadym Sep 8, 2023
2db0331
Remove plugins CLI
ivadym Sep 8, 2023
35e500c
CHANGELOG
ivadym Sep 8, 2023
370ddaf
Merge develop
ivadym Sep 11, 2023
de356c6
Merge branch 'cache-version-analysis' into run-cache-version
ivadym Sep 11, 2023
2b4d158
Merge branch 'run-cache-version' into remove-plugins
ivadym Sep 11, 2023
36fc976
Merge branch 'develop' into cache-version-analysis
ivadym Sep 12, 2023
3230f94
Merge branch 'cache-version-analysis' into run-cache-version
ivadym Sep 12, 2023
9aff610
Merge branch 'run-cache-version' into remove-plugins
ivadym Sep 12, 2023
17ccbc9
Merge develop
ivadym Sep 12, 2023
8363dbf
Merge branch 'run-cache-version' into remove-plugins
ivadym Sep 12, 2023
83d711b
update PON config case
ivadym Sep 12, 2023
0688f55
Merge branch 'run-cache-version' into remove-plugins
ivadym Sep 12, 2023
114dc5c
Merge branch 'develop' into run-cache-version
ivadym Sep 12, 2023
0bce051
Merge branch 'run-cache-version' into remove-plugins
ivadym Sep 12, 2023
977a7cd
Merge branch 'develop' into remove-plugins
ivadym Sep 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions BALSAMIC/commands/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from BALSAMIC.commands.config.base import config as config_command
from BALSAMIC.commands.init.base import initialize as init_command
from BALSAMIC.commands.options import OPTION_LOG_LEVEL
from BALSAMIC.commands.plugins.base import plugins as plugins_command
from BALSAMIC.commands.report.base import report as report_command
from BALSAMIC.commands.run.base import run as run_command
from BALSAMIC.constants.constants import LogLevel
Expand Down Expand Up @@ -43,5 +42,4 @@ def cli(context: click.Context, log_level: LogLevel):
cli.add_command(run_command)
cli.add_command(report_command)
cli.add_command(config_command)
cli.add_command(plugins_command)
cli.add_command(init_command)
Empty file.
19 changes: 0 additions & 19 deletions BALSAMIC/commands/plugins/base.py

This file was deleted.

13 changes: 0 additions & 13 deletions BALSAMIC/commands/plugins/cov_plot.py

This file was deleted.

104 changes: 0 additions & 104 deletions BALSAMIC/commands/plugins/scout.py

This file was deleted.

132 changes: 0 additions & 132 deletions BALSAMIC/commands/plugins/vcfutils.py

This file was deleted.

2 changes: 1 addition & 1 deletion BALSAMIC/snakemake_rules/align/sentieon_alignment.rule
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ rule sentieon_realign:
Path(benchmark_dir, "sentieon_realign_{sample_type}.{sample}.tsv").as_posix()
params:
tmpdir = tempfile.mkdtemp(prefix=tmp_dir),
sentieon_exec = config["SENTIEON_EXEC"],
sentieon_exec = config["SENTIEON_EXEC"],
sentieon_lic = config["SENTIEON_LICENSE"],
sample_id = "{sample}"
threads:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Removed:
* Config folder https://github.com/Clinical-Genomics/BALSAMIC/pull/1175
* Quality trimming of fastqs for UMI workflow https://github.com/Clinical-Genomics/BALSAMIC/pull/1176
* Balsamic container https://github.com/Clinical-Genomics/BALSAMIC/pull/1230

* Plugin CLI https://github.com/Clinical-Genomics/BALSAMIC/pull/1245

[12.0.2]
--------
Expand Down
18 changes: 0 additions & 18 deletions tests/commands/plugins/conftest.py

This file was deleted.

36 changes: 0 additions & 36 deletions tests/commands/plugins/test_scout.py

This file was deleted.

Loading