Skip to content

Commit cfd8863

Browse files
committed
Refactored code
1 parent d54947b commit cfd8863

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

bin/get_metadata.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
class RunfolderInfo:
17-
def __init__(self, runfolder, demultiplexer_outdir):
17+
def __init__(self, runfolder):
1818
self.runfolder = runfolder
1919
self.run_info = self.read_run_info()
2020
self.run_parameters = self.read_run_parameters()
@@ -158,9 +158,8 @@ def get_demultiplexing_info(self):
158158

159159
args = parser.parse_args()
160160
runfolder = args.runfolder
161-
demultiplexer_outdir = args.demultiplexer_outdir
162161

163-
runfolder_info = RunfolderInfo(runfolder, demultiplexer_outdir)
162+
runfolder_info = RunfolderInfo(runfolder)
164163
info = runfolder_info.get_info()
165164

166165
print(

main.nf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,9 @@ process GET_METADATA {
257257
path 'sequencing_metadata_mqc.yaml'
258258

259259
script:
260-
if ( params.demultiplexer_outdir ){
261-
demultiplexer_outdir_section = "--demultiplexer-outdir ${params.demultiplexer_outdir}"
262-
} else {
263-
demultiplexer_outdir_section = ""
264-
}
265260
"""
266261
python ${params.script_dir}/get_metadata.py --runfolder $runfolder \\
267-
$demultiplexer_outdir_section &> sequencing_metadata_mqc.yaml
262+
&> sequencing_metadata_mqc.yaml
268263
"""
269264
}
270265

tests/unit_tests/test_get_metadata.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@pytest.fixture
1515
def runfolder_info():
16-
return RunfolderInfo("test_data/210510_M03910_0104_000000000-JHGJL", "Unaligned")
16+
return RunfolderInfo("test_data/210510_M03910_0104_000000000-JHGJL")
1717

1818

1919
@pytest.fixture
@@ -65,7 +65,7 @@ def test_get_run_parameters(runfolder_info):
6565

6666
def test_run_parameters_novaseq_x():
6767
runfolder_info = RunfolderInfo(
68-
"test_data/20230125_lh00103_0036_A222VGWLT3", "Unaligned"
68+
"test_data/20230125_lh00103_0036_A222VGWLT3"
6969
)
7070
filtered_run_parameters = runfolder_info.get_run_parameters()
7171
assert filtered_run_parameters["Instrument type"] == "NovaSeqXPlus"
@@ -75,12 +75,12 @@ def test_run_parameters_novaseq_x():
7575

7676
def test_find_flowcell_type_novaseqx():
7777
runfolder_info = RunfolderInfo(
78-
"test_data/20230125_lh00103_0036_A222VGWLT3", "Unaligned"
78+
"test_data/20230125_lh00103_0036_A222VGWLT3"
7979
)
8080
flowcell_type = runfolder_info.find_flowcell_type_novaseqx()
8181
assert flowcell_type["Flowcell type"] == "10B"
8282
runfolder_info = RunfolderInfo(
83-
"test_data/210510_M03910_0104_000000000-JHGJL", "Unaligned"
83+
"test_data/210510_M03910_0104_000000000-JHGJL"
8484
)
8585
flowcell_type = runfolder_info.find_flowcell_type_novaseqx()
8686
assert flowcell_type is None

0 commit comments

Comments
 (0)