From b6056d261994b14db23f5793fce8248edc9deac8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 23:09:56 +0000 Subject: [PATCH 1/8] Bump maggma from 0.51.18 to 0.51.19 (#371) Bumps [maggma](https://github.com/materialsproject/maggma) from 0.51.18 to 0.51.19. - [Release notes](https://github.com/materialsproject/maggma/releases) - [Changelog](https://github.com/materialsproject/maggma/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/materialsproject/maggma/compare/v0.51.18...v0.51.19) --- updated-dependencies: - dependency-name: maggma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 26eb946f..b9559da7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ strict = [ "monty==2023.5.8", "networkx==3.1", "pydash==7.0.5", - "maggma==0.51.18", + "maggma==0.51.19", "pydantic==1.10.9", "PyYAML==6.0", "FireWorks==2.0.3", From 08dc070dcd30a21cecd693b64ad8cb7855b411a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 23:10:06 +0000 Subject: [PATCH 2/8] Bump moto from 4.1.12 to 4.1.13 (#372) Bumps [moto](https://github.com/getmoto/moto) from 4.1.12 to 4.1.13. - [Changelog](https://github.com/getmoto/moto/blob/master/CHANGELOG.md) - [Commits](https://github.com/getmoto/moto/compare/4.1.12...4.1.13) --- updated-dependencies: - dependency-name: moto dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b9559da7..31f3c263 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ strict = [ "FireWorks==2.0.3", "matplotlib==3.7.2", "pydot==1.4.2", - "moto==4.1.12", + "moto==4.1.13", "typing-extensions==4.7.1", ] From 53fad45d0e19712544d5b4ceb791aa3ad095d8d3 Mon Sep 17 00:00:00 2001 From: Matthew Horton Date: Thu, 20 Jul 2023 13:22:33 -0700 Subject: [PATCH 3/8] Update forum link --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index fd3a5a88..6f4a2204 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: jobflow Support Forum - url: https://matsci.org/c/fireworks + url: https://matsci.org/jobflow about: Please ask and answer questions here. From d3fa86fef96fa9e9489a072946e51118fc2e2e8c Mon Sep 17 00:00:00 2001 From: Max Gallant Date: Fri, 21 Jul 2023 14:03:52 -0700 Subject: [PATCH 4/8] Adds allow_bson=True to jsanitize invocation in contains_job_or_flow --- src/jobflow/utils/find.py | 2 +- tests/utils/test_find.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/jobflow/utils/find.py b/src/jobflow/utils/find.py index 4f48240b..ab841101 100644 --- a/src/jobflow/utils/find.py +++ b/src/jobflow/utils/find.py @@ -213,7 +213,7 @@ def contains_flow_or_job(obj: Any) -> bool: # argument is a primitive, we won't find an flow or job here return False - obj = jsanitize(obj, strict=True) + obj = jsanitize(obj, strict=True, allow_bson=True) # recursively find any reference classes locations = find_key_value(obj, "@class", "Flow") diff --git a/tests/utils/test_find.py b/tests/utils/test_find.py index f5842ff5..5a5160a1 100644 --- a/tests/utils/test_find.py +++ b/tests/utils/test_find.py @@ -54,6 +54,8 @@ def test_update_in_dictionary(): def test_contains_job_or_flow(): + from datetime import datetime + from jobflow import Flow, Job from jobflow.utils import contains_flow_or_job @@ -74,3 +76,4 @@ def test_contains_job_or_flow(): assert contains_flow_or_job([[job]]) is True assert contains_flow_or_job({"a": job}) is True assert contains_flow_or_job({"a": [job]}) is True + assert contains_flow_or_job({"a": [job], "b": datetime.now()}) is True From 409861b8eafae344ad1a1d07bc3aabef06ee539b Mon Sep 17 00:00:00 2001 From: Max Gallant Date: Fri, 21 Jul 2023 17:02:37 -0700 Subject: [PATCH 5/8] Also allow_bson in job serialization --- src/jobflow/core/job.py | 2 +- tests/core/test_job.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/jobflow/core/job.py b/src/jobflow/core/job.py index 4d5f5c0a..b3ceda00 100644 --- a/src/jobflow/core/job.py +++ b/src/jobflow/core/job.py @@ -1068,7 +1068,7 @@ def as_dict(self) -> dict: # fireworks can't serialize functions and classes, so explicitly serialize to # the job recursively using monty to avoid issues - return jsanitize(d, strict=True, enum_values=True) + return jsanitize(d, strict=True, enum_values=True, allow_bson=True) def __setattr__(self, key, value): """Handle setting attributes. Implements a special case for job name.""" diff --git a/tests/core/test_job.py b/tests/core/test_job.py index e5410195..3273dc75 100644 --- a/tests/core/test_job.py +++ b/tests/core/test_job.py @@ -558,12 +558,15 @@ class MySchema(BaseModel): def test_serialization(): import json + from datetime import datetime from monty.json import MontyDecoder, MontyEncoder from jobflow import Job - test_job = Job(function=add, function_args=(1,), function_kwargs={"b": 2}) + test_job = Job( + function=add, function_args=(1, datetime.now()), function_kwargs={"b": 2} + ) uuid = test_job.uuid From 944d661a837fb576e0a1ee70db5493ec31194abc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 23:36:10 +0000 Subject: [PATCH 6/8] Bump maggma from 0.51.19 to 0.51.24 (#378) Bumps [maggma](https://github.com/materialsproject/maggma) from 0.51.19 to 0.51.24. - [Release notes](https://github.com/materialsproject/maggma/releases) - [Changelog](https://github.com/materialsproject/maggma/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/materialsproject/maggma/compare/v0.51.19...v0.51.24) --- updated-dependencies: - dependency-name: maggma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 31f3c263..fd3ce02f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ strict = [ "monty==2023.5.8", "networkx==3.1", "pydash==7.0.5", - "maggma==0.51.19", + "maggma==0.51.24", "pydantic==1.10.9", "PyYAML==6.0", "FireWorks==2.0.3", From 6206e66135e10bb1233cbdf65939b138acb08d68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 23:36:16 +0000 Subject: [PATCH 7/8] Bump sphinx from 6.2.0 to 7.1.0 (#377) Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 6.2.0 to 7.1.0. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v6.2.0...v7.1.0) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fd3ce02f..589957b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ dependencies = [ [project.optional-dependencies] docs = [ - "sphinx==6.2.0", + "sphinx==7.1.0", "furo==2023.5.20", "myst_parser==2.0.0", "ipython==8.14.0", From 53f0c76e4cc0baf40c1f9365b31ad2604cc8a601 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 23:36:20 +0000 Subject: [PATCH 8/8] Bump pyyaml from 6.0 to 6.0.1 (#379) Bumps [pyyaml](https://github.com/yaml/pyyaml) from 6.0 to 6.0.1. - [Changelog](https://github.com/yaml/pyyaml/blob/6.0.1/CHANGES) - [Commits](https://github.com/yaml/pyyaml/compare/6.0...6.0.1) --- updated-dependencies: - dependency-name: pyyaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 589957b1..d8de1d30 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ strict = [ "pydash==7.0.5", "maggma==0.51.24", "pydantic==1.10.9", - "PyYAML==6.0", + "PyYAML==6.0.1", "FireWorks==2.0.3", "matplotlib==3.7.2", "pydot==1.4.2",