Revert public functions in fst.py, h1x.py to accept positional args

Author: leehart

malariagen_data/anoph/fst.py

@@ -104,7 +104,6 @@ def _fst_gwss(
     )
     def fst_gwss(
         self,
-        *,
         contig: base_params.contig,
         window_size: fst_params.window_size,
         cohort1_query: base_params.sample_query,
@@ -126,7 +125,7 @@ def fst_gwss(
     ) -> Tuple[np.ndarray, np.ndarray]:
         # Change this name if you ever change the behaviour of this function, to
         # invalidate any previously cached data.
-        name = "fst_gwss_v3"
+        name = "fst_gwss_v2"
 
         params = dict(
             contig=contig,
@@ -164,7 +163,6 @@ def fst_gwss(
     )
     def plot_fst_gwss_track(
         self,
-        *,
         contig: base_params.contig,
         window_size: fst_params.window_size,
         cohort1_query: base_params.sample_query,
@@ -271,7 +269,6 @@ def plot_fst_gwss_track(
     )
     def plot_fst_gwss(
         self,
-        *,
         contig: base_params.contig,
         window_size: fst_params.window_size,
         cohort1_query: base_params.sample_query,
@@ -358,7 +355,6 @@ def plot_fst_gwss(
     )
     def average_fst(
         self,
-        *,
         region: base_params.region,
         cohort1_query: base_params.sample_query,
         cohort2_query: base_params.sample_query,
@@ -428,7 +424,6 @@ def average_fst(
     )
     def pairwise_average_fst(
         self,
-        *,
         region: base_params.region,
         cohorts: base_params.cohorts,
         sample_sets: Optional[base_params.sample_sets] = None,

malariagen_data/anoph/h1x.py

@@ -102,7 +102,6 @@ def _h1x_gwss(
     )
     def h1x_gwss(
         self,
-        *,
         contig: base_params.contig,
         window_size: h12_params.window_size,
         cohort1_query: base_params.sample_query,
@@ -123,7 +122,7 @@ def h1x_gwss(
     ) -> Tuple[np.ndarray, np.ndarray]:
         # Change this name if you ever change the behaviour of this function, to
         # invalidate any previously cached data.
-        name = "h1x_gwss_v2"
+        name = "h1x_gwss_v1"
 
         params = dict(
             contig=contig,
@@ -163,7 +162,6 @@ def h1x_gwss(
     )
     def plot_h1x_gwss_track(
         self,
-        *,
         contig: base_params.contig,
         window_size: h12_params.window_size,
         cohort1_query: base_params.cohort1_query,
@@ -272,7 +270,6 @@ def plot_h1x_gwss_track(
     )
     def plot_h1x_gwss(
         self,
-        *,
         contig: base_params.contig,
         window_size: h12_params.window_size,
         cohort1_query: base_params.cohort1_query,