Skip to content

Use tskit C API 1.2.0 #2424

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 1 commit into from
Sep 24, 2025
Merged

Use tskit C API 1.2.0 #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 git-submodules/tskit
Open in desktop
Submodule tskit updated 187 files
8 changes: 4 additions & 4 deletions lib/subprojects/tskit.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[wrap-file]
directory = tskit-1.0.0
directory = tskit-1.2.0

source_url = https://github.com/tskit-dev/tskit/releases/download/C_1.0.0/tskit-1.0.0.tar.xz
source_filename = tskit-1.0.0.tar.xz
source_hash = f8a085fc6ef170706b76a307e18be4ab425f31a1f50fa9765ab2c2d81eef65c2
source_url = https://github.com/tskit-dev/tskit/releases/download/C_1.2.0/tskit-1.2.0.tar.xz
source_filename = tskit-1.2.0.tar.xz
source_hash = f8f4c341b34df3620404ba8d6c362e3bb7257d48962373c6499871fc2e26b388
2 changes: 1 addition & 1 deletion lib/tests/test_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ test_tskit_version(void)
{
/* Make sure we don't have any accidental changes to the tskit submodule. */
CU_ASSERT_EQUAL(TSK_VERSION_MAJOR, 1);
CU_ASSERT_EQUAL(TSK_VERSION_MINOR, 0);
CU_ASSERT_EQUAL(TSK_VERSION_MINOR, 2);
CU_ASSERT_EQUAL(TSK_VERSION_PATCH, 0);
}

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def get_extension():
"mutgen.c",
"likelihood.c",
]
tsk_source_files = ["core.c", "tables.c", "trees.c"]
tsk_source_files = ["core.c", "tables.c", "trees.c", "genotypes.c"]
kas_source_files = ["kastore.c"]

sources = (
Expand Down
2 changes: 1 addition & 1 deletion tests/test_lowlevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ def test_gsl_error_handler(self):
def test_tsk_library_version(self):
tsk_version = _msprime.get_tskit_c_version()
# Update this when the tskit C library version changes
assert tsk_version == (1, 0, 0)
assert tsk_version == (1, 2, 0)


def get_random_population_models(n):
Expand Down
Loading