Skip to content

Enable keep attrs#139

Closed
jhamman wants to merge 13 commits into
pydata:masterfrom
jhamman:enable_keep_attrs
Closed

Enable keep attrs#139
jhamman wants to merge 13 commits into
pydata:masterfrom
jhamman:enable_keep_attrs

Conversation

@jhamman

@jhamman jhamman commented May 21, 2014

Copy link
Copy Markdown
Member

Fixes #138

@shoyer

shoyer commented May 21, 2014

Copy link
Copy Markdown
Member

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

jhamman commented May 21, 2014

Copy link
Copy Markdown
Member Author

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

shoyer commented May 21, 2014

Copy link
Copy Markdown
Member

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

jhamman commented May 21, 2014

Copy link
Copy Markdown
Member Author

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

shoyer commented May 21, 2014

Copy link
Copy Markdown
Member

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

jhamman commented May 21, 2014

Copy link
Copy Markdown
Member Author

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