Skip to content

Commit b0a44be

Browse files
committed
Merge PR #474 (@armish, fix Java 7 for Mutect 1)
2 parents d74bd5d + 765cd9a commit b0a44be

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

src/environment_setup/tool_providers.ml

+17-2
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,24 @@ let mutect_tool
415415
let tool = Machine.Tool.Default.mutect in
416416
let open KEDSL in
417417
let install_path = install_tools_path // Tool_def.to_directory_name tool in
418+
let conda_env = (* mutect doesn't run on Java; so need to provide Java 7 *)
419+
Conda.(setup_environment
420+
~python_version:`Python2
421+
~base_packages:[("java-jdk", `Version "7.0.91")]
422+
install_path
423+
"mutect_env")
424+
in
425+
let conda_ensure = Conda.(configured ~run_program ~host ~conda_env) in
426+
let conda_init = Conda.init_env ~conda_env () in
418427
let get_mutect = get_broad_jar ~run_program ~host ~install_path loc in
419-
Machine.Tool.create tool ~ensure:get_mutect
420-
~init:Program.(shf "export mutect_HOME=%s" install_path)
428+
let edges = [depends_on conda_ensure; depends_on get_mutect] in
429+
let ensure =
430+
workflow_node without_product ~name:"MuTect setup" ~edges
431+
in
432+
let init =
433+
Program.(conda_init && shf "export mutect_HOME=%s" install_path)
434+
in
435+
Machine.Tool.create tool ~ensure ~init
421436
422437
let gatk_tool
423438
~(run_program : Machine.Make_fun.t)

0 commit comments

Comments
 (0)