Skip to content

Commit a4b60cc

Browse files
authored
Refactor the whole file structure for future pipelines (#139)
* Refactor the modules and files accoording to the discussion, fixed the imports, test would fail though. * Refactor the testing modules and files accoording to the discussion, fixed the imports, test should pass. * Update the package structures and CLI to adapt to the adapters. * Update the adapter WDLS.
1 parent 6cf5fd8 commit a4b60cc

Some content is hidden

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

46 files changed

+807
-565
lines changed

adapter_pipelines/Optimus/adapter.wdl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ task GetInputs {
2222
2323
# Force the binary layer of the stdout and stderr streams to be unbuffered.
2424
python -u <<CODE
25-
from pipeline_tools import input_utils
25+
from pipeline_tools.pipelines.optimus import optimus
2626
27-
input_utils.create_optimus_input_tsv(
28-
"${bundle_uuid}",
29-
"${bundle_version}",
30-
"${dss_url}")
27+
optimus.create_optimus_input_tsv(
28+
"${bundle_uuid}",
29+
"${bundle_version}",
30+
"${dss_url}")
3131
3232
CODE
3333
>>>
@@ -139,7 +139,7 @@ workflow AdapterOptimus {
139139
Int max_cromwell_retries = 0
140140
Boolean add_md5s = false
141141

142-
String pipeline_tools_version = "v0.49.1"
142+
String pipeline_tools_version = "v0.50.0"
143143

144144
call GetInputs as prep {
145145
input:

adapter_pipelines/cellranger/adapter.wdl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ task GetInputs {
2222
2323
# Force the binary layer of the stdout and stderr streams to be unbuffered.
2424
python -u <<CODE
25-
from pipeline_tools import input_utils
25+
from pipeline_tools.pipelines.cellranger import cellranger
2626
27-
input_utils.get_cellranger_input_files(
28-
"${bundle_uuid}",
29-
"${bundle_version}",
30-
"${dss_url}")
27+
cellranger.create_cellranger_input_tsv(
28+
"${bundle_uuid}",
29+
"${bundle_version}",
30+
"${dss_url}")
3131
3232
CODE
3333
>>>
@@ -150,7 +150,7 @@ workflow Adapter10xCount {
150150
Int max_cromwell_retries = 0
151151
Boolean add_md5s = false
152152

153-
String pipeline_tools_version = "v0.49.1"
153+
String pipeline_tools_version = "v0.50.0"
154154

155155
call GetInputs {
156156
input:

adapter_pipelines/ss2_single_sample/adapter.wdl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ task GetInputs {
2222
2323
# Force the binary layer of the stdout and stderr streams to be unbuffered.
2424
python -u <<CODE
25-
from pipeline_tools import input_utils
25+
from pipeline_tools.pipelines.smartseq2 import smartseq2
2626
27-
input_utils.create_ss2_input_tsv(
28-
"${bundle_uuid}",
29-
"${bundle_version}",
30-
"${dss_url}")
27+
smartseq2.create_ss2_input_tsv(
28+
"${bundle_uuid}",
29+
"${bundle_version}",
30+
"${dss_url}")
3131
3232
CODE
3333
>>>
@@ -82,7 +82,7 @@ workflow AdapterSmartSeq2SingleCell{
8282
Int max_cromwell_retries = 0
8383
Boolean add_md5s = false
8484

85-
String pipeline_tools_version = "v0.49.1"
85+
String pipeline_tools_version = "v0.50.0"
8686

8787
call GetInputs as prep {
8888
input:

0 commit comments

Comments
 (0)