Merge pull request #73 from malariagen/72-cohort-list

Bug fix and doc update for 0.12.1
malariagen · Oct 22, 2021 · d5df2f5 · d5df2f5
2 parents f88b1bd + 875ff6b
commit d5df2f5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -73,6 +73,10 @@ $ poetry publish
 
 ## Release notes
 
+### 0.12.1
+
+* Bug fix to `Ag3.sample_cohorts()`.
+
 ### 0.12.0
 
 * Updates default cohort parameter to latest analysis (20210927).

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/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "malariagen_data"
-version = "0.12.0"
+version = "0.12.1"
 description = "A package for accessing MalariaGEN public data."
 authors = ["Alistair Miles <[email protected]>", "Chris Clarkson <[email protected]>"]
 license = "MIT"

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 = (