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

Simultaneous sources in pulse events #353

Merged
merged 1 commit into from
Jul 28, 2021

Conversation

apragsdale
Copy link
Member

WIP. First pass to update existing code and tests to handle sources and proportions as lists instead of str/value. See popsim-consortium/demes-spec#100 for discussion.

Need to expand testing of valid and invalid pulses with multiple sources.

@codecov
Copy link

codecov bot commented Jul 8, 2021

Codecov Report

Merging #353 (a14a593) into main (586f073) will increase coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head a14a593 differs from pull request most recent head d59c466. Consider uploading reports for the commit d59c466 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##             main     #353   +/-   ##
=======================================
  Coverage   99.93%   99.93%           
=======================================
  Files           5        5           
  Lines        1502     1518   +16     
=======================================
+ Hits         1501     1517   +16     
  Misses          1        1           
Impacted Files Coverage Δ
demes/demes.py 100.00% <100.00%> (ø)
demes/ms.py 100.00% <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 586f073...d59c466. Read the comment docs.

Copy link
Member

@grahamgower grahamgower left a comment

Choose a reason for hiding this comment

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

LGTM @apragsdale. Just a couple of minor code nits.

demes/demes.py Outdated Show resolved Hide resolved
demes/demes.py Outdated Show resolved Hide resolved
demes/demes.py Outdated Show resolved Hide resolved
demes/demes.py Outdated Show resolved Hide resolved
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.

Changes basically LGTM, but I haven't gone through the fine details.

@apragsdale
Copy link
Member Author

apragsdale commented Jul 26, 2021

Thanks for the suggestions, @grahamgower. I think everything is looking reasonable here after rebasing from the merge of #362. Will squash if you agree.

@grahamgower
Copy link
Member

Looks good @apragsdale. Sorry for giving you more work, with all the merge conflicts!

@apragsdale
Copy link
Member Author

apragsdale commented Jul 28, 2021

No problem at all! Thanks @grahamgower. I'll squash and merge after addressing your comment.

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.

3 participants