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

Removal of TEST_COMPAT and OLD_XML code #31

Merged
merged 1 commit into from
Aug 14, 2012

Conversation

esc24
Copy link
Member

@esc24 esc24 commented Aug 10, 2012

Fixes issue #26.

Also converted remaining netcdf_units cml results file to new XML format and changed erroneous .nc file extension to .cml.

@iris.tests.skip_data
class TestRegrid(tests.IrisTest):
@staticmethod
def patch_data(cube):
Copy link
Member

Choose a reason for hiding this comment

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

How were the tests working before this?

Copy link
Member Author

Choose a reason for hiding this comment

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

There was a function old_style() that in addition to some TEST_COMPAT code also removed the surface_altitude coord and the cube's aux_factory.

@pelson
Copy link
Member

pelson commented Aug 10, 2012

Looks good. We all seem to be working on very similar things so were getting quite a few conflict. Hopefully that will die down soon, but as it is, it will need re-basing inorder to merge.

My advice would be to wait for #34 to go onto master before doing the rebase.

@esc24
Copy link
Member Author

esc24 commented Aug 13, 2012

Thanks Phil.

@pelson
Copy link
Member

pelson commented Aug 13, 2012

My advice would be to wait for #34 to go onto master before doing the rebase.

Actually, I'm not sure about this statement anymore. It seems they are pretty independent after all.

@bblay
Copy link
Contributor

bblay commented Aug 13, 2012

What about all the updated cml results, shouldn't they be bundled in with this work?

@pelson
Copy link
Member

pelson commented Aug 13, 2012

What about all the updated cml results, shouldn't they be bundled in with this work?

Not sure what you mean? FYI #21 implemented the new xml.

@bblay
Copy link
Contributor

bblay commented Aug 13, 2012

Ah, yes, um. cough. That's what I thought.

@esc24
Copy link
Member Author

esc24 commented Aug 14, 2012

I've rebased this against upstream/master so it can be automatically merged.

bblay added a commit that referenced this pull request Aug 14, 2012
Removal of TEST_COMPAT and OLD_XML code
@bblay bblay merged commit b0ffa7f into SciTools:master Aug 14, 2012
pelson pushed a commit that referenced this pull request Jun 27, 2016
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