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

use assert_allclose in the aggregation-with-units tests #4174

Merged
merged 2 commits into from
Jun 24, 2020
Merged

use assert_allclose in the aggregation-with-units tests #4174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7317bd4
use assert_allclose in the aggregation tests
keewis Jun 24, 2020
f562e4b
install pint using pip
keewis Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci/requirements/py36-min-nep18.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ dependencies:
- msgpack-python=0.6 # remove once distributed is bumped. distributed GH3491
- numpy=1.17
- pandas=0.25
- pint
- pip
- pytest
- pytest-cov
- pytest-env
- scipy=1.2
- setuptools=41.2
- sparse=0.8
- pip:
- pint==0.13
2 changes: 1 addition & 1 deletion ci/requirements/py36.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies:
- numba
- numpy
- pandas
- pint
- pip
- pseudonetcdf
- pydap
Expand All @@ -45,3 +44,4 @@ dependencies:
- zarr
- pip:
- numbagg
- pint
2 changes: 1 addition & 1 deletion ci/requirements/py37-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies:
- numba
- numpy
- pandas
- pint
- pip
- pseudonetcdf
- pydap
Expand All @@ -45,3 +44,4 @@ dependencies:
- zarr
- pip:
- numbagg
- pint
2 changes: 1 addition & 1 deletion ci/requirements/py37.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies:
- numba
- numpy
- pandas
- pint
- pip
- pseudonetcdf
- pydap
Expand All @@ -45,3 +44,4 @@ dependencies:
- zarr
- pip:
- numbagg
- pint
2 changes: 1 addition & 1 deletion ci/requirements/py38-all-but-dask.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ dependencies:
- numba
- numpy
- pandas
- pint
- pip
- pseudonetcdf
- pydap
Expand All @@ -42,3 +41,4 @@ dependencies:
- zarr
- pip:
- numbagg
- pint
2 changes: 1 addition & 1 deletion ci/requirements/py38.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies:
- numba
- numpy
- pandas
- pint
- pip
- pseudonetcdf
- pydap
Expand All @@ -45,3 +44,4 @@ dependencies:
- zarr
- pip:
- numbagg
- pint
6 changes: 3 additions & 3 deletions xarray/tests/test_units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ def test_aggregation(self, func, dtype):
actual = func(variable)

assert_units_equal(expected, actual)
xr.testing.assert_identical(expected, actual)
assert_allclose(expected, actual)

# TODO: remove once pint==0.12 has been released
@pytest.mark.xfail(
Expand Down Expand Up @@ -2296,7 +2296,7 @@ def test_aggregation(self, func, dtype):
actual = func(data_array)

assert_units_equal(expected, actual)
xr.testing.assert_allclose(expected, actual)
assert_allclose(expected, actual)

@pytest.mark.parametrize(
"func",
Expand Down Expand Up @@ -3861,7 +3861,7 @@ def test_aggregation(self, func, dtype):
expected = attach_units(func(strip_units(ds)), units)

assert_units_equal(expected, actual)
assert_equal(expected, actual)
assert_allclose(expected, actual)

@pytest.mark.parametrize("property", ("imag", "real"))
def test_numpy_properties(self, property, dtype):
Expand Down