Skip to content

Conversation

@DPeterK
Copy link
Member

@DPeterK DPeterK commented Oct 10, 2017

Closes #2644

@DPeterK DPeterK requested a review from corinnebosley October 10, 2017 16:03
@corinnebosley
Copy link
Member

@dkillick You've got a 'from iris.tests.test_interpolation import normalise_order' left in iris.tests.test_analysis_calculus.py.

Copy link
Member

@corinnebosley corinnebosley left a comment

Choose a reason for hiding this comment

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

Pending the one-line removal and then the tests passing, I'm happy with this. I had some concerns that some of the tests in the module you have removed were testing the not-deprecated interpolate code, but I checked and they don't, so it's all good.

@DPeterK
Copy link
Member Author

DPeterK commented Oct 11, 2017

To avoid importing iris.tests.test_interpolation.normalise_order in iris.tests.analysis.test_interpolate.py I've just deleted this test module. The tests contained in it fail locally regardless of whether I introduce normalise_order back into the test module or not, and we're going to need to delete this test module anyway as part of upcoming work, so I thought I'd get ahead.

@corinnebosley
Copy link
Member

@dkillick Hang on a minute, are we getting rid of all iris.analysis.interpolate code and just keeping regrid stuff instead?

@DPeterK
Copy link
Member Author

DPeterK commented Oct 11, 2017

@corinnebosley Travis has gone green!! 😀 🎉

@corinnebosley corinnebosley merged commit 6154b2c into SciTools:master Oct 11, 2017
@corinnebosley
Copy link
Member

Boom!

@DPeterK DPeterK deleted the remove_interpolate branch October 11, 2017 14:11
@QuLogic QuLogic added this to the v2.0 milestone Oct 12, 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.

3 participants