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

Demes import #710

Merged
merged 1 commit into from Apr 2, 2021
Merged

Demes import #710

merged 1 commit into from Apr 2, 2021

Conversation

apragsdale
Copy link
Collaborator

First steps to get demes into fwdpy11, updated from the previous demes2fwdpy11 repo.

fwdpy11/_functions/import_demes.py Show resolved Hide resolved
.github/workflows/tests.yml Outdated Show resolved Hide resolved
@@ -0,0 +1,24 @@
description: Two deme model with migration and size changes.
Copy link
Owner

Choose a reason for hiding this comment

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

It'd be very cool if demes made its own examples available as package data.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I agree - should open an issue for that over in the demes repo

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There are some examples perhaps, now that I think of it. I can see if there are and try to use some of those instead of having the example yaml file here.

Copy link
Owner

Choose a reason for hiding this comment

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

Yeah, I'm just not sure they go in via "pip install".

fwdpy11/_functions/import_demes.py Outdated Show resolved Hide resolved
fwdpy11/_functions/import_demes.py Show resolved Hide resolved
@molpopgen
Copy link
Owner

This looks great. Just a few comments.

Copy link
Owner

@molpopgen molpopgen left a comment

Choose a reason for hiding this comment

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

This is looking good. Just one more doc string thing, then we can probably squash and merge. We can update the manual in a later PR.

@@ -535,3 +525,16 @@ def _timed_events(self):
self.set_migration_rates,
]:
yield i


def from_demes(
Copy link
Owner

Choose a reason for hiding this comment

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

Let's get the "versionadded" bit here, too, as this is the user-facing function.

@molpopgen
Copy link
Owner

Awesome--thanks!

@molpopgen molpopgen merged commit bc2c82d into molpopgen:dev Apr 2, 2021
@apragsdale apragsdale deleted the demes_import branch April 2, 2021 19:33
@molpopgen molpopgen added this to the 0.14.0 milestone Apr 3, 2021
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.

None yet

2 participants