Merge branch 'master' into GH965-g123-cache-key-fix

Author: adilraza99

malariagen_data/anoph/cnv_data.py

@@ -642,9 +642,13 @@ def cnv_discordant_read_calls(
 
                 ly.append(y)
 
-                if len(ly) == 0:
-                    # Bail out, no data for given sample sets and analysis.
-                    raise ValueError("No data found for requested sample sets.")
+            if len(ly) == 0:
+                # Bail out, no data for given sample sets and contig.
+                raise ValueError(
+                    f"No CNV discordant read calls data found for contig {c!r} "
+                    f"in the requested sample sets. This could be because the "
+                    f"sample sets do not have discordant read calls data available."
+                )
 
             x = _simple_xarray_concat(ly, dim=DIM_SAMPLE)
             lx.append(x)

malariagen_data/mjn.py

@@ -281,12 +281,6 @@ def _mjn_graph_edges(
                 # add edge from final intermediate node to node j
                 source = f"anon_{i}_{j}_{sep-2}"
                 target = j
-                graph_node = {
-                    "id": source,
-                    "count": 0,
-                    "width": anon_width,
-                }
-                graph_nodes.append(graph_node)
                 graph_edge = {
                     "id": f"edge_{i}_{j}_{sep-1}",
                     "source": source,

tests/anoph/test_cnv_data.py

@@ -626,7 +626,10 @@ def test_cnv_discordant_read_calls(fixture, api: AnophelesCnvData):
             assert isinstance(d2, xr.DataArray)
 
     # Check with a contig that should not exist
-    with pytest.raises(ValueError):
+    with pytest.raises(
+        ValueError,
+        match="No CNV discordant read calls data found|no CNVs available for contig",
+    ):
         api.cnv_discordant_read_calls(
             contig="foobar", sample_sets=random.choice(all_sample_sets)
         )