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

Deprecate CalcInterface #250

Merged
merged 6 commits into from
Dec 19, 2017
Merged

Deprecate CalcInterface #250

merged 6 commits into from
Dec 19, 2017

Conversation

spencerahill
Copy link
Owner

C.f. #249. Turns out this was easier than I thought it would be.

Although I accidentally forgot to pull the latest commits to my local develop branch before creating this branch, so I'll have to resolve the merge conflicts manually.

Given how easy this was, I'm inclined to proceed with it.

Copy link
Collaborator

@spencerkclark spencerkclark left a comment

Choose a reason for hiding this comment

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

Indeed this does seem pretty straightforward! It looks like you just need to merge with the latest master branch and you should be good.

Edit: obviously you're well aware of the need to merge and as you note above, of course it's the develop branch in our case :)

@@ -237,7 +236,7 @@ def _combine_core_aux_specs(self):

def create_calcs(self):
"""Generate a Calc object for each requested parameter combination."""
return [Calc(CalcInterface(**sp)) for sp in
return [Calc(**sp) for sp in
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could this fit on one line now?

@spencerahill
Copy link
Owner Author

Very weird, this test is passing on my local machine...

@spencerahill
Copy link
Owner Author

Disregard previous comment; hadn't pushed latest changes. In it goes!

@spencerahill spencerahill merged commit 41e4fec into develop Dec 19, 2017
@spencerahill spencerahill deleted the rm-calc-interface branch December 19, 2017 01:31
@spencerahill spencerahill changed the title WIP Deprecate CalcInterface Deprecate CalcInterface Dec 19, 2017
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