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

cast units to str before applying any other preprocessor #498

Merged
merged 4 commits into from
Jan 31, 2024
Merged

cast units to str before applying any other preprocessor #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1974e8a
add a preprocessor that casts everything to `str`
keewis Jan 31, 2024
8f2ceed
check that integer units are properly converted to `str`
keewis Jan 31, 2024
3ee6b89
remove the xfail, this has been fixed 2-3 years ago
keewis Jan 31, 2024
997ea4b
Update cf_xarray/units.py
dcherian Jan 31, 2024
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
8 changes: 7 additions & 1 deletion cf_xarray/tests/test_units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,13 @@ def test_percent_units():
assert str(ureg("%").units) == "percent"


@pytest.mark.xfail(reason="not supported by pint, yet: hgrecco/pint#1295")
def test_integer_units():
"""Test that integer 1 units is equal to dimensionless"""
# need to explicitly use parse_units to bypass the runtime type checking
# in the quantity constructor
assert str(ureg.parse_units(1)) == "dimensionless"


def test_udunits_power_syntax():
"""Test that UDUNITS style powers are properly parsed and interpreted."""
assert ureg("m2 s-2").units == ureg.m**2 / ureg.s**2
Expand Down
6 changes: 6 additions & 0 deletions cf_xarray/units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ def repl(m):
],
force_ndarray_like=True,
)
# ----- end block copied from metpy

# need to insert to make sure this is the first preprocessor
# This ensures we convert integer `1` to string `"1"`, as needed by pint.
units.preprocessors.insert(0, str)

# -----
units.define("percent = 0.01 = %")

# Define commonly encountered units (both CF and non-CF) not defined by pint
Expand Down
Loading