Skip to content

Commit

Permalink
synDNA -> SynDNA
Browse files Browse the repository at this point in the history
  • Loading branch information
antgonza committed Feb 18, 2024
1 parent 8c7dfee commit e59ab12
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion qp_woltka/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

# WGS cell counts
req_params = {
'synDNA hits': ('artifact', ['BIOM']),
'SynDNA hits': ('artifact', ['BIOM']),
'Woltka per-genome': ('artifact', ['BIOM'])
}
opt_params = {
Expand Down
6 changes: 3 additions & 3 deletions qp_woltka/tests/test_woltka.py
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ def test_woltka_syndna_to_array(self):
self.assertCountEqual(ainfo, exp)

def test_calculate_cell_counts(self):
params = {'synDNA hits': 5, 'Woltka per-genome': 6,
params = {'SynDNA hits': 5, 'Woltka per-genome': 6,
'min_coverage': 1, 'read_length': 150,
'min_rsquared': 0.8}
job_id = 'my-job-id'
Expand All @@ -569,7 +569,7 @@ def test_calculate_cell_counts(self):
self.qclient, job_id, params, out_dir)
self.assertFalse(success)
self.assertEqual(msg, "No logs found, are you sure you selected the "
"correct artifact for 'synDNA hits'?")
"correct artifact for 'SynDNA hits'?")

# this should fail too because but now we are getting deeper into
# the validation
Expand Down Expand Up @@ -603,7 +603,7 @@ def test_calculate_cell_counts(self):
'type': "BIOM",
'name': "SynDNA Hits - Test",
'prep': pid}
params['synDNA hits'] = self.qclient.post(
params['SynDNA hits'] = self.qclient.post(
'/apitest/artifact/', data=data)['artifact']

success, ainfo, msg = calculate_cell_counts(
Expand Down
6 changes: 3 additions & 3 deletions qp_woltka/woltka.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,18 +571,18 @@ def calculate_cell_counts(qclient, job_id, parameters, out_dir):
"""
error = ''
# let's get the syndna_id and prep in a single go
syndna_id = parameters['synDNA hits']
syndna_id = parameters['SynDNA hits']
syndna_files, prep = qclient.artifact_and_preparation_files(syndna_id)
if 'log' not in syndna_files.keys():
error = ("No logs found, are you sure you selected the correct "
"artifact for 'synDNA hits'?")
"artifact for 'SynDNA hits'?")
else:

lin_regress_by_sample_id_fp = [f for f in syndna_files['log']
if 'lin_regress_by_sample_id' in f]
if not lin_regress_by_sample_id_fp:
error = ("No 'lin_regress_by_sample_id' log found, are you sure "
" you selected the correct artifact for 'synDNA hits'?")
" you selected the correct artifact for 'SynDNA hits'?")
else:
lin_regress_by_sample_id_fp = lin_regress_by_sample_id_fp[0]

Expand Down

0 comments on commit e59ab12

Please sign in to comment.