Merge branch 'master' into GH410_add_sample_query_options

Author: leehart

malariagen_data/anoph/fst.py

@@ -325,6 +325,7 @@ def plot_fst_gwss(
             toolbar_location="above",
             merge_tools=True,
             sizing_mode=sizing_mode,
+            toolbar_options=dict(active_inspect=None),
         )
 
         if show:  # pragma: no cover

malariagen_data/anoph/g123.py

@@ -481,6 +481,7 @@ def plot_g123_gwss(
             toolbar_location="above",
             merge_tools=True,
             sizing_mode=sizing_mode,
+            toolbar_options=dict(active_inspect=None),
         )
 
         if show:  # pragma: no cover

malariagen_data/anoph/h12.py

@@ -505,6 +505,7 @@ def plot_h12_gwss(
             toolbar_location="above",
             merge_tools=True,
             sizing_mode=sizing_mode,
+            toolbar_options=dict(active_inspect=None),
         )
 
         if show:  # pragma: no cover

malariagen_data/anoph/h1x.py

@@ -328,6 +328,7 @@ def plot_h1x_gwss(
             toolbar_location="above",
             merge_tools=True,
             sizing_mode=sizing_mode,
+            toolbar_options=dict(active_inspect=None),
         )
 
         if show:  # pragma: no cover

tests/anoph/test_pca.py

@@ -96,7 +96,7 @@ def test_pca_plotting(fixture, api: AnophelesPca):
     n_snps = random.randint(4, n_snps_available)
     # PC3 required for plot_pca_coords_3d()
     assert min(n_samples, n_snps) > 3
-    n_components = random.randint(3, min(n_samples, n_snps))
+    n_components = random.randint(3, min(n_samples, n_snps, 10))
 
     # Run the PCA.
     pca_df, pca_evr = api.pca(
@@ -184,7 +184,7 @@ def test_pca_exclude_samples(fixture, api: AnophelesPca):
     # PCA parameters.
     n_samples = ds.sizes["samples"] - n_samples_excluded
     n_snps_available = ds.sizes["variants"]
-    n_snps = random.randint(1, n_snps_available)
+    n_snps = random.randint(4, n_snps_available)
     n_components = random.randint(2, min(n_samples, n_snps, 10))
 
     # Run the PCA.
@@ -245,7 +245,7 @@ def test_pca_fit_exclude_samples(fixture, api: AnophelesPca):
     # PCA parameters.
     n_samples = ds.sizes["samples"]
     n_snps_available = ds.sizes["variants"]
-    n_snps = random.randint(1, n_snps_available)
+    n_snps = random.randint(4, n_snps_available)
     n_components = random.randint(2, min(n_samples, n_snps, 10))
 
     # Run the PCA.