diff --git a/src/bd_rhapsody/bd_rhapsody_make_reference/config.vsh.yaml b/src/bd_rhapsody/bd_rhapsody_make_reference/config.vsh.yaml index b615faa0..dc71262b 100644 --- a/src/bd_rhapsody/bd_rhapsody_make_reference/config.vsh.yaml +++ b/src/bd_rhapsody/bd_rhapsody_make_reference/config.vsh.yaml @@ -136,9 +136,9 @@ engines: - type: docker run: | mkdir /var/bd_rhapsody_cwl && \ - cd /var/bd_rhapsody_cwl && \ - git clone https://bitbucket.org/CRSwDev/cwl.git . && \ - git checkout 8feeace1141b24749ea6003f8e6ad6d3ad5232de + cd /var/bd_rhapsody_cwl && \ + git clone https://bitbucket.org/CRSwDev/cwl.git . && \ + git checkout 8feeace1141b24749ea6003f8e6ad6d3ad5232de - type: docker run: - VERSION=$(ls -v /var/bd_rhapsody_cwl | grep '^v' | sed 's#v##' | tail -1) diff --git a/src/bd_rhapsody/bd_rhapsody_make_reference/script.py b/src/bd_rhapsody/bd_rhapsody_make_reference/script.py index 009b5bf4..dcbfe933 100644 --- a/src/bd_rhapsody/bd_rhapsody_make_reference/script.py +++ b/src/bd_rhapsody/bd_rhapsody_make_reference/script.py @@ -108,8 +108,7 @@ def generate_config(par: dict[str, Any], meta, config) -> str: def get_cwl_file(meta: dict[str, Any]) -> str: # create cwl file (if need be) - #cwl_file=os.path.join(meta["resources_dir"], "make_rhap_reference_2.2.1_nodocker.cwl") - cwl_file="/var/bd_rhapsody_cwl/v2.2.1/Extra_Utilities/bd_rhapsody_make_reference.cwl" + cwl_file="/var/bd_rhapsody_cwl/v2.2.1/Extra_Utilities/make_rhap_reference_2.2.1.cwl" return os.path.abspath(cwl_file) diff --git a/src/bd_rhapsody/bd_rhapsody_sequence_analysis/config.vsh.yaml b/src/bd_rhapsody/bd_rhapsody_sequence_analysis/config.vsh.yaml index 6c5b771b..1c1f609a 100644 --- a/src/bd_rhapsody/bd_rhapsody_sequence_analysis/config.vsh.yaml +++ b/src/bd_rhapsody/bd_rhapsody_sequence_analysis/config.vsh.yaml @@ -649,9 +649,9 @@ engines: - type: docker run: | mkdir /var/bd_rhapsody_cwl && \ - cd /var/bd_rhapsody_cwl && \ - git clone https://bitbucket.org/CRSwDev/cwl.git . && \ - git checkout 8feeace1141b24749ea6003f8e6ad6d3ad5232de + cd /var/bd_rhapsody_cwl && \ + git clone https://bitbucket.org/CRSwDev/cwl.git . && \ + git checkout 8feeace1141b24749ea6003f8e6ad6d3ad5232de - type: docker run: - VERSION=$(ls -v /var/bd_rhapsody_cwl | grep '^v' | sed 's#v##' | tail -1) diff --git a/src/bd_rhapsody/bd_rhapsody_sequence_analysis/test.py b/src/bd_rhapsody/bd_rhapsody_sequence_analysis/test.py index 17a3cb07..6b8be319 100644 --- a/src/bd_rhapsody/bd_rhapsody_sequence_analysis/test.py +++ b/src/bd_rhapsody/bd_rhapsody_sequence_analysis/test.py @@ -29,7 +29,7 @@ # Generate index print("> Generate index", flush=True) # cwl_file = meta["resources_dir"] / "bd_rhapsody_make_reference.cwl" -cwl_file = "/var/bd_rhapsody_cwl/v2.2.1/Extra_Utilities/bd_rhapsody_make_reference.cwl" +cwl_file = "/var/bd_rhapsody_cwl/v2.2.1/Extra_Utilities/make_rhap_reference_2.2.1.cwl" reference_small_gtf = meta["resources_dir"] / "test_data" / "reference_small.gtf" reference_small_fa = meta["resources_dir"] / "test_data" / "reference_small.fa" bdabseq_panel_fa = meta["resources_dir"] / "test_data" / "BDAbSeq_ImmuneDiscoveryPanel.fasta"