Skip to content

Ignore data and mask order#967

Merged
bjlittle merged 2 commits intoSciTools:masterfrom
rhattersley:ignore-order
Jan 21, 2014
Merged

Ignore data and mask order#967
bjlittle merged 2 commits intoSciTools:masterfrom
rhattersley:ignore-order

Conversation

@rhattersley
Copy link
Member

As discussed in #939 (and implemented by @shoyer), this PR removes the "order" and "mask_order" attributes from the CML tests.

@bjlittle
Copy link
Member

@rhattersley do you fancy rebasing this against master now that #968 is in ... since it's a pretty noisy PR.

Looks good though 👍 thanks @shoyer!

@ghost ghost assigned bjlittle Jan 21, 2014
@rhattersley
Copy link
Member Author

Rebased.

@bjlittle
Copy link
Member

Dah! Copyright year update needed for cube.py ... 😩

@rhattersley
Copy link
Member Author

Rebased again. 😒

@bjlittle
Copy link
Member

Excellent, thanks 👍 ... Travis is good, but can't automatically merge due to conflicts 😿

@rhattersley ... rebase again?

@shoyer
Copy link
Contributor

shoyer commented Jan 21, 2014

Looks good to me -- thanks for separating this out! 👍

bjlittle added a commit that referenced this pull request Jan 21, 2014
@bjlittle bjlittle merged commit 86db993 into SciTools:master Jan 21, 2014
@rhattersley
Copy link
Member Author

Thanks @bjlittle

@rhattersley rhattersley deleted the ignore-order branch January 21, 2014 16:54
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