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

Update to tskit C API 1.0.0 #2061

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Update to tskit C API 1.0.0 #2061

merged 1 commit into from
Jun 27, 2022

Conversation

benjeffery
Copy link
Member

@benjeffery benjeffery commented May 26, 2022

Fixes #2060
Took the liberty of removing the git submodule in the process.

@benjeffery benjeffery changed the title Update to tskit 1.0.0 - removing git submodule Update to tskit C API 1.0.0 - removing git submodule May 26, 2022
@jeromekelleher
Copy link
Member

It's not obvious that removing the submodule is better here - won't we have to manually vendor in tskit every time we update then?

@benjeffery
Copy link
Member Author

It's not obvious that removing the submodule is better here - won't we have to manually vendor in tskit every time we update then?

Yes, but we had to update the submodule anyway - I know which one gives me less hassle! Your call!

@benjeffery
Copy link
Member Author

Hmm the LWT is the fly in the vendoring ointment. Probably easiest to keep the submodule.

@benjeffery benjeffery force-pushed the tskit1.0.0 branch 2 times, most recently from 27e10ad to 2e98e36 Compare May 26, 2022 18:44
@benjeffery benjeffery changed the title Update to tskit C API 1.0.0 - removing git submodule Update to tskit C API 1.0.0 May 26, 2022
@jeromekelleher
Copy link
Member

Hmm the LWT is the fly in the vendoring ointment. Probably easiest to keep the submodule.

I'm sure I went round this one a few times relatively recently and decided the submodule was the lesser of n evils

@benjeffery
Copy link
Member Author

This cannot proceed until the next tskit python release as the LWT tests fail when used against tskit 0.4.1.

@jeromekelleher
Copy link
Member

This should be good to pick up now @benjeffery?

@codecov
Copy link

codecov bot commented Jun 27, 2022

Codecov Report

Merging #2061 (b1afb99) into main (f717961) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2061   +/-   ##
=======================================
  Coverage   91.35%   91.35%           
=======================================
  Files          20       20           
  Lines       10893    10893           
  Branches     2273     2273           
=======================================
  Hits         9951     9951           
  Misses        515      515           
  Partials      427      427           
Flag Coverage Δ
C 91.35% <100.00%> (ø)
python 98.82% <ø> (ø)

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

Impacted Files Coverage Δ
lib/msprime.c 86.08% <100.00%> (ø)
msprime/_msprimemodule.c 86.61% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f717961...b1afb99. Read the comment docs.

@benjeffery
Copy link
Member Author

Looks ready to go now!

Copy link
Member

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mergify mergify bot merged commit d70abaa into tskit-dev:main Jun 27, 2022
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.

Update to tskit C 1.0
2 participants