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

Enable keep attrs #139

Closed
wants to merge 13 commits into from
Closed

Enable keep attrs #139

wants to merge 13 commits into from

Conversation

jhamman
Copy link
Member

@jhamman jhamman commented May 21, 2014

Fixes #138

@shoyer
Copy link
Member

shoyer commented May 21, 2014

The commit history here is getting a little messy. Could you make a commit which only adds the keep_attrs option to DataArray and Variable on top of master? Then, if we merge this in first, you can rebase #137 on top.

@jhamman
Copy link
Member Author

jhamman commented May 21, 2014

Agreed that this is messy and my apologies for trying to do too many things at once. I'm more inclined to wait until we're done with #137 if that's ok. Then I think it should be simple enough to merge the master back here and clean up the commit history. If you don't think that will work, I will put together a clean commit off master.

@shoyer
Copy link
Member

shoyer commented May 21, 2014

That's fine, we can deal with #137 first.

@shoyer shoyer mentioned this pull request May 21, 2014
Joe Hamman added 2 commits May 21, 2014 13:33
Conflicts:
	doc/tutorial.rst
	test/test_dataset.py
	xray/dataset.py
@jhamman jhamman closed this May 21, 2014
@jhamman
Copy link
Member Author

jhamman commented May 21, 2014

I'm closing this since, as you mentioned above, its gotten messy. I'm cleaning it up now and will reopen when I've got my act in order.

@shoyer
Copy link
Member

shoyer commented May 21, 2014

I've found GitHub doesn't handle rebases on master very well -- you end up with a lot of extra commits in your PR which makes it hard to review. So the cleanest thing to do may be to open a new PR.

@jhamman
Copy link
Member Author

jhamman commented May 21, 2014

Exactly, see #141 for new PR.

@jhamman jhamman deleted the enable_keep_attrs branch July 27, 2015 05:38
keewis pushed a commit to keewis/xarray that referenced this pull request Jan 17, 2024
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.

keep attrs when reducing xray objects
2 participants