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.

Sign up for GitHub

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

Jump to bottom

fix da.pad example for numpy 1.20 #4865

Merged
merged 3 commits into from
Feb 7, 2021
Merged

fix da.pad example for numpy 1.20 #4865

merged 3 commits into from
Feb 7, 2021

Conversation

mathause
Copy link
Collaborator

@mathause mathause commented Feb 5, 2021

@mathause
Copy link
Collaborator Author

mathause commented Feb 5, 2021

cc @mark-boer

keewis
keewis reviewed Feb 5, 2021
View reviewed changes
Copy link
Collaborator

@keewis keewis left a comment

Choose a reason for hiding this comment

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

could you add a test for the correct behavior? It's somewhat unfortunate that this was only caught by the doctests.

xarray/core/dataarray.py Outdated Show resolved Hide resolved
@mark-boer
Copy link
Contributor

@keewis, I agree a test would be nice, but what kind of test would you want to add? I mean, xarray just mimics the behaviour of np.pad and dask.array.pad. And the default behaviour of numpy was a bit funky, which is probably why they changed it.

@keewis
Copy link
Collaborator

keewis commented Feb 6, 2021 •
edited
Loading

not sure. I would probably try to either check the new behavior of numpy with an example, or just copy the doctest into a test.

Edit: it would probably be good to merge this as soon as possible, all PRs fail because of this.

@mathause
Copy link
Collaborator Author

mathause commented Feb 7, 2021

Thanks for the review. I added some minimal tests. I think it could be good to discuss the type coercion in a new issue.

@mathause mathause mentioned this pull request Feb 7, 2021
Merged
4 tasks
keewis
keewis approved these changes Feb 7, 2021
View reviewed changes
Copy link
Collaborator

@keewis keewis left a comment •
edited
Loading

Choose a reason for hiding this comment

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

thanks, looks good to me now.

I think it could be good to discuss the type coercion in a new issue.

👍

@dcherian dcherian merged commit ec7f628 into pydata:master Feb 7, 2021
dcherian added a commit to dcherian/xarray that referenced this pull request Feb 7, 2021
@dcherian
Merge remote-tracking branch 'upstream/master' into get_group
513ae67 
* upstream/master:
  fix da.pad example for numpy 1.20 (pydata#4865)
  temporarily pin dask (pydata#4873)
dcherian added a commit to DWesl/xarray that referenced this pull request Feb 11, 2021
@dcherian
Merge remote-tracking branch 'upstream/master' into read_grid_mapping…
b65e579 
…_and_bounds_as_coords

* upstream/master: (51 commits)
  Ensure maximum accuracy when encoding and decoding cftime.datetime values (pydata#4758)
  Fix `bounds_error=True` ignored with 1D interpolation (pydata#4855)
  add a drop_conflicts strategy for merging attrs (pydata#4827)
  update pre-commit hooks (mypy) (pydata#4883)
  ensure warnings cannot become errors in assert_ (pydata#4864)
  update pre-commit hooks (pydata#4874)
  small fixes for the docstrings of swap_dims and integrate (pydata#4867)
  Modify _encode_datetime_with_cftime for compatibility with cftime > 1.4.0 (pydata#4871)
  vélin (pydata#4872)
  don't skip the doctests CI (pydata#4869)
  fix da.pad example for numpy 1.20 (pydata#4865)
  temporarily pin dask (pydata#4873)
  Add units if "unit" is in the attrs. (pydata#4850)
  speed up the repr for big MultiIndex objects (pydata#4846)
  dim -> coord in DataArray.integrate (pydata#3993)
  WIP: backend interface, now it uses subclassing  (pydata#4836)
  weighted: small improvements (pydata#4818)
  Update related-projects.rst (pydata#4844)
  iris update doc url (pydata#4845)
  Faster unstacking (pydata#4746)
  ...
dcherian added a commit to dcherian/xarray that referenced this pull request Feb 12, 2021
@dcherian
Merge remote-tracking branch 'upstream/master' into fix/4107
8ce7175 
* upstream/master: (24 commits)
  Compatibility with dask 2021.02.0 (pydata#4884)
  Ensure maximum accuracy when encoding and decoding cftime.datetime values (pydata#4758)
  Fix `bounds_error=True` ignored with 1D interpolation (pydata#4855)
  add a drop_conflicts strategy for merging attrs (pydata#4827)
  update pre-commit hooks (mypy) (pydata#4883)
  ensure warnings cannot become errors in assert_ (pydata#4864)
  update pre-commit hooks (pydata#4874)
  small fixes for the docstrings of swap_dims and integrate (pydata#4867)
  Modify _encode_datetime_with_cftime for compatibility with cftime > 1.4.0 (pydata#4871)
  vélin (pydata#4872)
  don't skip the doctests CI (pydata#4869)
  fix da.pad example for numpy 1.20 (pydata#4865)
  temporarily pin dask (pydata#4873)
  Add units if "unit" is in the attrs. (pydata#4850)
  speed up the repr for big MultiIndex objects (pydata#4846)
  dim -> coord in DataArray.integrate (pydata#3993)
  WIP: backend interface, now it uses subclassing  (pydata#4836)
  weighted: small improvements (pydata#4818)
  Update related-projects.rst (pydata#4844)
  iris update doc url (pydata#4845)
  ...
@mathause mathause deleted the fix_pad_example branch October 18, 2021 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcherian dcherian dcherian approved these changes

@keewis keewis keewis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

doctest failure with numpy 1.20
4 participants
@mathause @mark-boer @keewis @dcherian