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

use keep_attrs in binary operations II #2590

Merged
merged 8 commits into from
Dec 12, 2018
Merged

Conversation

MBlaschek
Copy link
Contributor

Please revise and advise.

@pep8speaks
Copy link

pep8speaks commented Dec 5, 2018

Hello @MBlaschek! Thanks for updating the PR.

Comment last updated on December 07, 2018 at 09:40 Hours UTC

@dcherian
Copy link
Contributor

dcherian commented Dec 5, 2018

Thanks @MBlaschek.

  1. You'll need to also add a note to doc/whats-new.rst.
  2. Looks like there's trailing whitespace in test_variable.py that will need to be fixed.

EDIT: Looks like the tests aren't running because of this ImportError

ImportError while importing test module '/home/travis/build/pydata/xarray/xarray/tests/test_variable.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
xarray/tests/test_variable.py:27: in <module>
    from . import (
E   ImportError: cannot import name 'set_options'

I think you need from xarray import set_options as in test_dataset.py. You can test this out locally using pytest. We have some documentation on contributing here: http://xarray.pydata.org/en/stable/contributing.html. Feel free to ask if you have questions

xarray/tests/test_variable.py Outdated Show resolved Hide resolved
xarray/tests/test_variable.py Outdated Show resolved Hide resolved
doc/whats-new.rst Outdated Show resolved Hide resolved
@MBlaschek
Copy link
Contributor Author

I hope that is all you guys wanted. It's kinda complicated for me to follow all these procedures to do really simple thing. I hope that helps and thanks for the inside into pull-requests.
Please let me know if I can close it and be done with it.

@dcherian
Copy link
Contributor

Thanks, @MBlaschek. Looks great to me.

@shoyer shoyer merged commit 82789bc into pydata:master Dec 12, 2018
@shoyer
Copy link
Member

shoyer commented Dec 12, 2018

Thank @MBlaschek -- we appreciate your help here! It does get easier for next time, I promise :)

@MBlaschek
Copy link
Contributor Author

Cool. I will keep using Xarray. Thanks for the great work

dcherian pushed a commit to yohai/xarray that referenced this pull request Dec 16, 2018
* upstream/master:
  Feature: N-dimensional auto_combine (pydata#2553)
  Support HighLevelGraphs (pydata#2603)
  Bump cftime version in doc environment (pydata#2604)
  use keep_attrs in binary operations II (pydata#2590)
  Temporarily mark dask-dev build as an allowed failure (pydata#2602)
  Fix wrong error message in interp() (pydata#2598)
  Add dayofyear and dayofweek accessors (pydata#2599)
  Fix h5netcdf saving scalars with filters or chunks (pydata#2591)
  Minor update to PR template (pydata#2596)
  Zarr consolidated (pydata#2559)
  fix examples (pydata#2581)
  Fix typo (pydata#2578)
  Concat docstring typo (pydata#2577)
  DOC: remove example using Dataset.T (pydata#2572)
  python setup.py test now works by default (pydata#2573)
  Return slices when possible from CFTimeIndex.get_loc() (pydata#2569)
  DOC: fix computation.rst (pydata#2567)
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.

4 participants