From 7317bd403caa8b233bc3e3d67d02334702a1d1a8 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 24 Jun 2020 16:57:06 +0200 Subject: [PATCH 1/2] use assert_allclose in the aggregation tests --- xarray/tests/test_units.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xarray/tests/test_units.py b/xarray/tests/test_units.py index b477e8cccb2..fb9063ca49e 100644 --- a/xarray/tests/test_units.py +++ b/xarray/tests/test_units.py @@ -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( @@ -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", @@ -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): From f562e4b9dc715a75223b0a0b29275f065840f353 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 24 Jun 2020 18:27:18 +0200 Subject: [PATCH 2/2] install pint using pip --- ci/requirements/py36-min-nep18.yml | 3 ++- ci/requirements/py36.yml | 2 +- ci/requirements/py37-windows.yml | 2 +- ci/requirements/py37.yml | 2 +- ci/requirements/py38-all-but-dask.yml | 2 +- ci/requirements/py38.yml | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/requirements/py36-min-nep18.yml b/ci/requirements/py36-min-nep18.yml index 48b9c057260..cd2b1a18c77 100644 --- a/ci/requirements/py36-min-nep18.yml +++ b/ci/requirements/py36-min-nep18.yml @@ -11,7 +11,6 @@ dependencies: - msgpack-python=0.6 # remove once distributed is bumped. distributed GH3491 - numpy=1.17 - pandas=0.25 - - pint - pip - pytest - pytest-cov @@ -19,3 +18,5 @@ dependencies: - scipy=1.2 - setuptools=41.2 - sparse=0.8 + - pip: + - pint==0.13 diff --git a/ci/requirements/py36.yml b/ci/requirements/py36.yml index a500173f277..aa2baf9dcce 100644 --- a/ci/requirements/py36.yml +++ b/ci/requirements/py36.yml @@ -28,7 +28,6 @@ dependencies: - numba - numpy - pandas - - pint - pip - pseudonetcdf - pydap @@ -45,3 +44,4 @@ dependencies: - zarr - pip: - numbagg + - pint diff --git a/ci/requirements/py37-windows.yml b/ci/requirements/py37-windows.yml index e9e5c7a900a..8b12704d644 100644 --- a/ci/requirements/py37-windows.yml +++ b/ci/requirements/py37-windows.yml @@ -28,7 +28,6 @@ dependencies: - numba - numpy - pandas - - pint - pip - pseudonetcdf - pydap @@ -45,3 +44,4 @@ dependencies: - zarr - pip: - numbagg + - pint diff --git a/ci/requirements/py37.yml b/ci/requirements/py37.yml index dba3926596e..70c453e8776 100644 --- a/ci/requirements/py37.yml +++ b/ci/requirements/py37.yml @@ -28,7 +28,6 @@ dependencies: - numba - numpy - pandas - - pint - pip - pseudonetcdf - pydap @@ -45,3 +44,4 @@ dependencies: - zarr - pip: - numbagg + - pint diff --git a/ci/requirements/py38-all-but-dask.yml b/ci/requirements/py38-all-but-dask.yml index a375d9e1e5a..6d76eecbd6a 100644 --- a/ci/requirements/py38-all-but-dask.yml +++ b/ci/requirements/py38-all-but-dask.yml @@ -25,7 +25,6 @@ dependencies: - numba - numpy - pandas - - pint - pip - pseudonetcdf - pydap @@ -42,3 +41,4 @@ dependencies: - zarr - pip: - numbagg + - pint diff --git a/ci/requirements/py38.yml b/ci/requirements/py38.yml index 7dff3a1bd97..6f35138978c 100644 --- a/ci/requirements/py38.yml +++ b/ci/requirements/py38.yml @@ -28,7 +28,6 @@ dependencies: - numba - numpy - pandas - - pint - pip - pseudonetcdf - pydap @@ -45,3 +44,4 @@ dependencies: - zarr - pip: - numbagg + - pint