Skip to content
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.

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

Always read alleles as strings (not bytes) #928

Merged
merged 1 commit into from
Jul 17, 2024

Conversation

hyanwong
Copy link
Member

@hyanwong hyanwong commented Jun 6, 2024

Fixes #810. Waiting to activate test until I understand what's wrong in #927

Copy link

codecov bot commented Jun 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.04%. Comparing base (e309fa4) to head (ac8eae9).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #928   +/-   ##
=======================================
  Coverage   87.04%   87.04%           
=======================================
  Files           5        5           
  Lines        1767     1767           
  Branches      310      310           
=======================================
  Hits         1538     1538           
  Misses        140      140           
  Partials       89       89           
Flag Coverage Δ
C 87.04% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jeromekelleher
Copy link
Member

So this doesn't help with #927 then?

@hyanwong
Copy link
Member Author

hyanwong commented Jun 7, 2024

No, #927 is independent of this PR, it's just that I noticed the problem when trying to write the unit tests.

@jeromekelleher
Copy link
Member

I think you'd be better off doing a quick msprime->Zarr wrapper here until tskit2zarr exists, the sgkit simulator is pretty primitive. This code here should basically do it.

@hyanwong
Copy link
Member Author

hyanwong commented Jun 7, 2024

This code here should basically do it.

Fab. Thanks Jerome. PR updated with this code. This is now for review (the actual change to formats.py is trivial: it's the test that takes most of the code)

@hyanwong
Copy link
Member Author

@Mergifyio rebase

Copy link
Contributor

mergify bot commented Jul 16, 2024

rebase

❌ Base branch update has failed

hyanwong does not have write access to the forked repository.

@hyanwong hyanwong mentioned this pull request Jul 17, 2024
@benjeffery
Copy link
Member

@Mergifyio rebase

Copy link
Contributor

mergify bot commented Jul 17, 2024

rebase

✅ Branch has been successfully rebased

@benjeffery
Copy link
Member

@Mergifyio rebase

Copy link
Contributor

mergify bot commented Jul 17, 2024

rebase

✅ Branch has been successfully rebased

@mergify mergify bot merged commit 141f0c7 into tskit-dev:main Jul 17, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Default SGkit alleles are byte strings, which confuses tsinfer:
3 participants