Skip to content

Commit f181596

Browse files
authored
Merge pull request #36 from BAMresearch/pint_to_central_unit_registry
changing unit handling to central pint unit registry
2 parents a0d4a6c + ee3f2f5 commit f181596

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/modacor/dataclasses/validators.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from numbers import Integral
66
from typing import Any, Type
77

8-
import pint
8+
from modacor import ureg
99

1010
from .databundle import DataBundle
1111
from .messagehandler import MessageHandler
@@ -31,7 +31,7 @@ def is_list_of_ints(instance: Type, attribute: str, value: Any):
3131
def check_data(
3232
data: DataBundle,
3333
data_element_name: str = None,
34-
required_unit: pint.Unit = None,
34+
required_unit: ureg.Unit = None,
3535
message_handler: MessageHandler = _dummy_handler,
3636
) -> bool:
3737
"""
@@ -52,7 +52,7 @@ def check_data(
5252
def check_data_element_and_units(
5353
data: DataBundle,
5454
data_element_name: str,
55-
required_unit: pint.Unit,
55+
required_unit: ureg.Unit,
5656
message_handler: MessageHandler,
5757
) -> bool:
5858
"""

src/modacor/tests/test_basedata.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
import pint
33
import pytest
44

5+
from modacor import ureg
6+
57
# import tiled.client # not sure what the class of tiled.client is...
68
from ..dataclasses.basedata import BaseData # adjust the import path as needed
79

@@ -11,17 +13,12 @@ class DummyClient:
1113
pass
1214

1315

14-
@pytest.fixture
15-
def ureg():
16-
return pint.UnitRegistry()
17-
18-
1916
@pytest.fixture
2017
def sample_data():
2118
return np.arange(5)
2219

2320

24-
def test_data_and_display_data_properties(ureg, sample_data):
21+
def test_data_and_display_data_properties(sample_data):
2522
# Create an instance of BaseData with test values
2623
bd = BaseData(
2724
ingest_units=ureg.m, # meters
@@ -51,7 +48,7 @@ def test_data_and_display_data_properties(ureg, sample_data):
5148
).all(), "display_data property did not convert units correctly."
5249

5350

54-
def test_rank_validation_exceeds_ndim(ureg):
51+
def test_rank_validation_exceeds_ndim():
5552
# Create a 2D DataArray
5653
arr = np.arange(4).reshape((2, 2))
5754

0 commit comments

Comments
 (0)