Use _importorskip to require pint >=0.15 instead of pytest.mark.skipif

Author: Russell Manser

xarray/tests/__init__.py

@@ -78,7 +78,8 @@ def LooseVersion(vstring):
 has_seaborn, requires_seaborn = _importorskip("seaborn")
 has_sparse, requires_sparse = _importorskip("sparse")
 has_cartopy, requires_cartopy = _importorskip("cartopy")
-has_pint, requires_pint = _importorskip("pint")
+# Need Pint 0.15 for __dask_tokenize__ tests for Quantity wrapped Dask Arrays
+has_pint_0_15, requires_pint_0_15 = _importorskip("pint", minversion="0.15")
 
 # some special cases
 has_scipy_or_netCDF4 = has_scipy or has_netCDF4

xarray/tests/test_dask.py

@@ -24,7 +24,7 @@
     assert_frame_equal,
     assert_identical,
     raises_regex,
-    requires_pint,
+    requires_pint_0_15,
     requires_scipy_or_netCDF4,
 )
 from .test_backends import create_tmp_file
@@ -293,14 +293,10 @@ def test_persist(self):
         self.assertLazyAndAllClose(u + 1, v)
         self.assertLazyAndAllClose(u + 1, v2)
 
-    @requires_pint
+    @requires_pint_0_15(reason="Need __dask_tokenize__")
     def test_tokenize_duck_dask_array(self):
         import pint
 
-        pytest.mark.skipif(
-            pint.__version__ < "0.15",
-            reason="Dask tokenize is not implemented for Pint < 0.15",
-        )
         unit_registry = pint.UnitRegistry()
 
         q = unit_registry.Quantity(self.data, "meter")
@@ -736,14 +732,10 @@ def test_from_dask_variable(self):
         a = DataArray(self.lazy_array.variable, coords={"x": range(4)}, name="foo")
         self.assertLazyAndIdentical(self.lazy_array, a)
 
-    @requires_pint
+    @requires_pint_0_15(reason="Need __dask_tokenize__")
     def test_tokenize_duck_dask_array(self):
         import pint
 
-        pytest.mark.skipif(
-            pint.__version__ < "0.15",
-            reason="Dask tokenize is not implemented for Pint < 0.15",
-        )
         unit_registry = pint.UnitRegistry()
 
         q = unit_registry.Quantity(self.data, unit_registry.meter)