fixes multi-release cohort issue and adds test

malariagen · Oct 22, 2021 · e163562 · e163562
1 parent f88b1bd
commit e163562
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/malariagen_data/ag3.py b/malariagen_data/ag3.py
@@ -1997,9 +1997,7 @@ def sample_cohorts(self, sample_sets="v3_wild", cohorts_analysis="20210927"):
         else:
             # concatenate multiple sample sets
             dfs = [
-                self._read_cohort_metadata(
-                    sample_set=c, cohorts_analysis=cohorts_analysis
-                )
+                self.sample_cohorts(sample_sets=c, cohorts_analysis=cohorts_analysis)
                 for c in sample_sets
             ]
             df = pandas.concat(dfs, axis=0, sort=False).reset_index(drop=True)

diff --git a/tests/test_ag3.py b/tests/test_ag3.py
@@ -1161,7 +1161,8 @@ def test_haplotypes(sample_sets, contig, analysis):
 
 # test v3 sample sets
 @pytest.mark.parametrize(
-    "sample_sets", ["v3_wild", "v3", "AG1000G-UG", ["AG1000G-AO", "AG1000G-FR"]]
+    "sample_sets",
+    ["v3_wild", "v3", ["v3_wild", "v3"], "AG1000G-UG", ["AG1000G-AO", "AG1000G-FR"]],
 )
 def test_sample_cohorts(sample_sets):
     expected_cols = (