keep compatibility with the development version of pint (#341)

keewis · web-flow · commit ef7534d1ab7e · 2022-06-28T06:32:45.000-06:00
* import from the new locations and fall back to the old ones

* use standard definition syntax instead
diff --git a/cf_xarray/units.py b/cf_xarray/units.py
@@ -77,9 +77,7 @@ def repl(m):
     force_ndarray_like=True,
 )
 
-units.define(
-    pint.unit.UnitDefinition("percent", "%", (), pint.converters.ScaleConverter(0.01))
-)
+units.define("percent = 0.01 = %")
 
 # Define commonly encountered units (both CF and non-CF) not defined by pint
 units.define("@alias meter = gpm")

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,7 @@ def repl(m):`
`77`	`77`	`force_ndarray_like=True,`
`78`	`78`	`)`
`79`	`79`
`80`		`-units.define(`
`81`		`- pint.unit.UnitDefinition("percent", "%", (), pint.converters.ScaleConverter(0.01))`
`82`		`-)`
	`80`	`+units.define("percent = 0.01 = %")`
`83`	`81`
`84`	`82`	`# Define commonly encountered units (both CF and non-CF) not defined by pint`
`85`	`83`	`units.define("@alias meter = gpm")`