Merge branch 'master' into GH993-fix-contig-shadowing

Author: adilraza99

malariagen_data/anopheles.py

@@ -1066,7 +1066,7 @@ def cohort_diversity_stats(
             cohort_label, cohort_query = cohort
 
         else:
-            raise TypeError(r"invalid cohort parameter: {cohort!r}")
+            raise TypeError(f"invalid cohort parameter: {cohort!r}")
 
         debug("access allele counts")
         ac = self.snp_allele_counts(