Skip to content

Fix deps#185

Merged
danielballan merged 3 commits intosoft-matter:masterfrom
danielballan:fix-deps
Oct 15, 2015
Merged

Fix deps#185
danielballan merged 3 commits intosoft-matter:masterfrom
danielballan:fix-deps

Conversation

@danielballan
Copy link
Member

This setup.py is updated to include the dependencies that we intend to be required. Some others are accidentally required -- this will be fixed in a separate PR.

@caspervdw
Copy link
Member

@danielballan are you OK with merging the slicerator dependency now?

The 0.3 tag does not list this dependency so that every user will see an ImportError until he/she installs slicerator.

@danielballan
Copy link
Member Author

Fair enough. I wanted to fix the long-existing problem with scipy and PIL deps too, but I'll merge this and push a v0.3.1. Tags are cheap. :- )

danielballan added a commit that referenced this pull request Oct 15, 2015
@danielballan danielballan merged commit 72d588b into soft-matter:master Oct 15, 2015
@danielballan
Copy link
Member Author

Done! Sorry for the runaround, @caspervdw.

@danielballan danielballan deleted the fix-deps branch October 15, 2015 15:33
@danielballan
Copy link
Member Author

Sigh. Caught you correct comment too late. I tagged and upload v0.3.2rc1. If it works I'll make it v0.3.2.

@caspervdw
Copy link
Member

Sorry for my late comment and good idea to make it an rc!

Now trackpy build fails because we dropped the PIL dependency of trackpy. Seems like #186 needs to be addressed soon.

@danielballan
Copy link
Member Author

Agreed.

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.

2 participants