diff --git a/cirrocumulus/util.py b/cirrocumulus/util.py index 113a8dd8..680eeea3 100644 --- a/cirrocumulus/util.py +++ b/cirrocumulus/util.py @@ -4,16 +4,11 @@ import fsspec import numpy as np import pandas as pd -import pandas._libs.json as ujson from flask import make_response +from pandas.io.json import ujson_dumps from cirrocumulus.envir import CIRRO_DATASET_PROVIDERS -try: - _dumps = ujson.dumps -except AttributeError: - _dumps = ujson.ujson_dumps - def to_json_array(values): """Coerce a pandas array to something the JSON encoder can walk. @@ -32,7 +27,7 @@ def dumps(data, **kwargs): data = {k: to_json_array(v) for k, v in data.items()} else: data = to_json_array(data) - return _dumps(data, **kwargs) + return ujson_dumps(data, **kwargs) def add_dataset_providers(): diff --git a/pyproject.toml b/pyproject.toml index e4dda5fb..4b7c4e3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ "fsspec", "gunicorn", "numpy", - "pandas", + "pandas>=2.2", "pymongo", "requests", "scipy",