From e59ab12c3f8a6e6a6e1ba23366814bf695ba2fae Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Sun, 18 Feb 2024 10:49:56 -0700 Subject: [PATCH] synDNA -> SynDNA --- qp_woltka/__init__.py | 2 +- qp_woltka/tests/test_woltka.py | 6 +++--- qp_woltka/woltka.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qp_woltka/__init__.py b/qp_woltka/__init__.py index 23d4377..cc43f06 100644 --- a/qp_woltka/__init__.py +++ b/qp_woltka/__init__.py @@ -64,7 +64,7 @@ # WGS cell counts req_params = { - 'synDNA hits': ('artifact', ['BIOM']), + 'SynDNA hits': ('artifact', ['BIOM']), 'Woltka per-genome': ('artifact', ['BIOM']) } opt_params = { diff --git a/qp_woltka/tests/test_woltka.py b/qp_woltka/tests/test_woltka.py index 866e5ae..6f5383b 100644 --- a/qp_woltka/tests/test_woltka.py +++ b/qp_woltka/tests/test_woltka.py @@ -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' @@ -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 @@ -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( diff --git a/qp_woltka/woltka.py b/qp_woltka/woltka.py index f07e48b..2815b30 100644 --- a/qp_woltka/woltka.py +++ b/qp_woltka/woltka.py @@ -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]