From e6aa67577310a82f0322315bebc40661ed03c50f Mon Sep 17 00:00:00 2001 From: Andrew-S-Rosen Date: Mon, 15 Apr 2024 15:24:32 -0700 Subject: [PATCH 1/5] Add support for yaml 0.18+ --- src/maggma/stores/gridfs.py | 5 +++-- src/maggma/stores/mongolike.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/maggma/stores/gridfs.py b/src/maggma/stores/gridfs.py index 8c5e38a36..590ff66db 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 0ebb6b747..1e86967ba 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"] From 90b55828055766e384bf70a48665514cc4e951dc Mon Sep 17 00:00:00 2001 From: "Andrew S. Rosen" Date: Mon, 15 Apr 2024 15:26:50 -0700 Subject: [PATCH 2/5] Update mongolike.py --- src/maggma/stores/mongolike.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/maggma/stores/mongolike.py b/src/maggma/stores/mongolike.py index 1e86967ba..bff85e311 100644 --- a/src/maggma/stores/mongolike.py +++ b/src/maggma/stores/mongolike.py @@ -156,7 +156,7 @@ def from_launchpad_file(cls, lp_file, collection_name, **kwargs): Returns: """ with open(lp_file) as f: - yaml = YAML(typ='safe', pure=True) + yaml = YAML(typ="safe", pure=True) lp_creds = yaml.load(f.read()) db_creds = lp_creds.copy() From 7349281be3a44d11031eb31e3046b2f0b5246611 Mon Sep 17 00:00:00 2001 From: "Andrew S. Rosen" Date: Mon, 15 Apr 2024 15:27:02 -0700 Subject: [PATCH 3/5] Update gridfs.py --- src/maggma/stores/gridfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/maggma/stores/gridfs.py b/src/maggma/stores/gridfs.py index 590ff66db..8fec29f4c 100644 --- a/src/maggma/stores/gridfs.py +++ b/src/maggma/stores/gridfs.py @@ -107,7 +107,7 @@ def from_launchpad_file(cls, lp_file, collection_name, **kwargs): Returns: """ with open(lp_file) as f: - yaml = YAML(typ='safe', pure=True) + yaml = YAML(typ="safe", pure=True) lp_creds = yaml.load(f.read()) db_creds = lp_creds.copy() From fd79944f6a7c81d86ced1248d82a929cd454c840 Mon Sep 17 00:00:00 2001 From: "Andrew S. Rosen" Date: Mon, 15 Apr 2024 15:27:44 -0700 Subject: [PATCH 4/5] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c12fd347d..0c6ef3e07 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.18", "pydantic>=2.0", "pydantic-settings>=2.0.3", "pymongo>=4.2.0", From ecf2f999286e0da241bc0c6d441d301c5977478c Mon Sep 17 00:00:00 2001 From: "Andrew S. Rosen" Date: Mon, 15 Apr 2024 15:28:44 -0700 Subject: [PATCH 5/5] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0c6ef3e07..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",