modifications for new gimli, standard-names

Author: mcflugen

src/bmi_tester/_tests/stage_1/info_test.py

@@ -1,7 +1,8 @@
 import warnings
 
 import pytest
-import standard_names
+from standard_names.standardname import StandardName
+from standard_names.standardname import is_valid_name
 
 
 def test_get_component_name(initialized_bmi):
@@ -15,8 +16,8 @@ def test_get_component_name(initialized_bmi):
 def test_var_names(var_name):
     """Test var names are valid."""
     assert isinstance(var_name, str)
-    if standard_names.is_valid_name(var_name):
-        standard_names.StandardName(var_name)
+    if is_valid_name(var_name):
+        StandardName(var_name)
     else:
         warnings.warn(f"not a valid standard name: {var_name}", stacklevel=2)
 

src/bmi_tester/api.py

@@ -4,13 +4,16 @@
 from collections.abc import Sequence
 
 try:
-    import gimli
+    from gimli._udunits2 import UdunitsError
+    from gimli.errors import IncompatibleUnitsError
+    from gimli.errors import UnitNameError
+    from gimli.units import units
 except ImportError:
     WITH_GIMLI_UNITS = False
     SECONDS = None
 else:
     WITH_GIMLI_UNITS = True
-    SECONDS = gimli.units.Unit("s")
+    SECONDS = units.Unit("s")
 
 import pytest
 
@@ -57,21 +60,21 @@ def check_bmi(
 
 def check_unit_is_valid(unit):
     try:
-        gimli.units.Unit(unit)
-    except gimli.UnitNameError:
+        units.Unit(unit)
+    except (UnitNameError, UdunitsError):
         return False
     else:
         return True
 
 
 def check_unit_is_time(unit):
     try:
-        gimli.units.Unit(unit).to(SECONDS)
-    except gimli.IncompatibleUnitsError:
+        units.Unit(unit).to(SECONDS)
+    except (IncompatibleUnitsError, UdunitsError):
         return False
     else:
         return True
 
 
 def check_unit_is_dimensionless(unit):
-    return gimli.units.Unit(unit).is_dimensionless
+    return units.Unit(unit).is_dimensionless