Skip to content

Refresh packages to use new msprime etc #3415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeromekelleher merged 2 commits into from
Mar 5, 2026
Merged

Refresh packages to use new msprime etc #3415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d36e7d
Refresh packages to use new msprime etc
jeromekelleher Mar 5, 2026
c6b22e4
Fixup tests on changed error messages
jeromekelleher Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ test = [
"kastore",
"lshmm",
"msgpack",
"msprime==1.4.1b1", # Temp - just to test msprime builds
"msprime",
"networkx",
"numba",
"portion",
Expand Down
8 changes: 4 additions & 4 deletions python/tests/test_python_c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,9 +1027,9 @@ def test_table_extend_bad_args(self, ts_fixture, table_name):
ll_table.extend(ll_table_copy, row_indexes=5)
with pytest.raises(TypeError):
ll_table.extend(ll_table_copy, row_indexes=[None])
with pytest.raises(ValueError, match="object too deep"):
with pytest.raises(ValueError, match="array"):
ll_table.extend(ll_table_copy, row_indexes=[[0, 1], [2, 3]])
with pytest.raises(ValueError, match="object too deep"):
with pytest.raises(ValueError, match="array"):
ll_table.extend(ll_table_copy, row_indexes=[[0, 1]])
with pytest.raises(_tskit.LibraryError, match="out of bounds"):
ll_table.extend(ll_table_copy, row_indexes=[-1])
Expand Down Expand Up @@ -3248,7 +3248,7 @@ def test_bad_nodes(self):
params["mode"] = "branch"
for nodes in ["abc", [[1, 2]]]:
params["nodes"] = nodes
with pytest.raises(ValueError, match="desired array"):
with pytest.raises(ValueError, match="array"):
ts.genetic_relatedness_vector(**params)
for nodes in [[-1, 3], [3, 2 * ts.get_num_nodes()]]:
params["nodes"] = nodes
Expand Down Expand Up @@ -3358,7 +3358,7 @@ def test_nodes_type_and_bounds(self):
ts = self.get_simple_example()
ref = b"NNNNNNNNNN"
# Bad nodes type
with pytest.raises(ValueError, match="desired array"):
with pytest.raises(ValueError, match="array"):
ts.decode_alignments(ref, [[0, 1]], 0, ts.get_sequence_length(), "N", True)
# Out of bounds
bad_nodes = np.array([ts.get_num_nodes()], dtype=np.int32)
Expand Down
Loading