Skip to content
forked from pydata/xarray

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into get_group
Browse files Browse the repository at this point in the history
* upstream/master:
  fix da.pad example for numpy 1.20 (pydata#4865)
  temporarily pin dask (pydata#4873)
  • Loading branch information
dcherian committed Feb 7, 2021
2 parents ed8d226 + ec7f628 commit 513ae67
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ci/requirements/environment-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
# - cdms2 # Not available on Windows
# - cfgrib # Causes Python interpreter crash on Windows: https://github.com/pydata/xarray/pull/3340
- cftime
- dask
- dask<2021.02.0
- distributed
- h5netcdf
- h5py=2
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- cdms2
- cfgrib
- cftime
- dask
- dask<2021.02.0
- distributed
- h5netcdf
- h5py=2
Expand Down
23 changes: 11 additions & 12 deletions xarray/core/dataarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -3851,9 +3851,8 @@ def pad(
Notes
-----
By default when ``mode="constant"`` and ``constant_values=None``, integer types will be
promoted to ``float`` and padded with ``np.nan``. To avoid type promotion
specify ``constant_values=np.nan``
For ``mode="constant"`` and ``constant_values=None``, integer types will be
promoted to ``float`` and padded with ``np.nan``.
Examples
--------
Expand All @@ -3880,16 +3879,16 @@ def pad(
* x (x) float64 nan 0.0 1.0 nan
* y (y) int64 10 20 30 40
z (x) float64 nan 100.0 200.0 nan
>>> da.pad(x=1, constant_values=np.nan)
Careful, ``constant_values`` are coerced to the data type of the array which may
lead to a loss of precision:
>>> da.pad(x=1, constant_values=1.23456789)
<xarray.DataArray (x: 4, y: 4)>
array([[-9223372036854775808, -9223372036854775808, -9223372036854775808,
-9223372036854775808],
[ 0, 1, 2,
3],
[ 10, 11, 12,
13],
[-9223372036854775808, -9223372036854775808, -9223372036854775808,
-9223372036854775808]])
array([[ 1, 1, 1, 1],
[ 0, 1, 2, 3],
[10, 11, 12, 13],
[ 1, 1, 1, 1]])
Coordinates:
* x (x) float64 nan 0.0 1.0 nan
* y (y) int64 10 20 30 40
Expand Down
20 changes: 20 additions & 0 deletions xarray/tests/test_dataarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -4472,6 +4472,26 @@ def test_pad_constant(self):
assert actual.shape == (7, 4, 5)
assert_identical(actual, expected)

ar = xr.DataArray([9], dims="x")

actual = ar.pad(x=1)
expected = xr.DataArray([np.NaN, 9, np.NaN], dims="x")
assert_identical(actual, expected)

actual = ar.pad(x=1, constant_values=1.23456)
expected = xr.DataArray([1, 9, 1], dims="x")
assert_identical(actual, expected)

if LooseVersion(np.__version__) >= "1.20":
with pytest.raises(ValueError, match="cannot convert float NaN to integer"):
ar.pad(x=1, constant_values=np.NaN)
else:
actual = ar.pad(x=1, constant_values=np.NaN)
expected = xr.DataArray(
[-9223372036854775808, 9, -9223372036854775808], dims="x"
)
assert_identical(actual, expected)

def test_pad_coords(self):
ar = DataArray(
np.arange(3 * 4 * 5).reshape(3, 4, 5),
Expand Down

0 comments on commit 513ae67

Please sign in to comment.