diff --git a/setup.py b/setup.py index c12fd347d..07edb877c 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ include_package_data=True, install_requires=[ "setuptools", - "ruamel.yaml<0.18", + "ruamel.yaml>=0.17", "pydantic>=2.0", "pydantic-settings>=2.0.3", "pymongo>=4.2.0", diff --git a/src/maggma/stores/gridfs.py b/src/maggma/stores/gridfs.py index 2e17008d8..2350dc14d 100644 --- a/src/maggma/stores/gridfs.py +++ b/src/maggma/stores/gridfs.py @@ -15,7 +15,7 @@ from pydash import get, has from pymongo import MongoClient, uri_parser from pymongo.errors import ConfigurationError -from ruamel import yaml +from ruamel.yaml import YAML from maggma.core import Sort, Store, StoreError from maggma.stores.mongolike import MongoStore @@ -107,7 +107,8 @@ def from_launchpad_file(cls, lp_file, collection_name, **kwargs): Returns: """ with open(lp_file) as f: - lp_creds = yaml.safe_load(f.read()) + yaml = YAML(typ="safe", pure=True) + lp_creds = yaml.load(f.read()) db_creds = lp_creds.copy() db_creds["database"] = db_creds["name"] diff --git a/src/maggma/stores/mongolike.py b/src/maggma/stores/mongolike.py index df332cb78..e6d6893ca 100644 --- a/src/maggma/stores/mongolike.py +++ b/src/maggma/stores/mongolike.py @@ -8,7 +8,7 @@ from itertools import chain, groupby from pathlib import Path -from ruamel import yaml +from ruamel.yaml import YAML from maggma.stores.ssh_tunnel import SSHTunnel @@ -156,7 +156,8 @@ def from_launchpad_file(cls, lp_file, collection_name, **kwargs): Returns: """ with open(lp_file) as f: - lp_creds = yaml.safe_load(f.read()) + yaml = YAML(typ="safe", pure=True) + lp_creds = yaml.load(f.read()) db_creds = lp_creds.copy() db_creds["database"] = db_creds["name"]