From dbc6cdc156b6cada887e4d66c5917716165718ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 04:19:13 +0000 Subject: [PATCH 1/6] Bump monty from 2024.12.10 to 2025.1.9 Bumps [monty](https://github.com/materialsvirtuallab/monty) from 2024.12.10 to 2025.1.9. - [Release notes](https://github.com/materialsvirtuallab/monty/releases) - [Changelog](https://github.com/materialsvirtuallab/monty/blob/master/docs/changelog.md) - [Commits](https://github.com/materialsvirtuallab/monty/compare/v2024.12.10...v2025.1.9) --- updated-dependencies: - dependency-name: monty dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 40336f8c2..85b27e7a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "h5io_browser==0.1.5", "h5py==3.12.1", "numpy==2.2.1", - "monty==2024.12.10", + "monty==2025.1.9", "pandas==2.2.3", "psutil==6.1.1", "pyfileindex==0.0.32", From be472074d914d4dbcbbe8ea1f013df05232c1811 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 04:22:22 +0000 Subject: [PATCH 2/6] [dependabot skip] Update environment --- .ci_support/environment-docs.yml | 2 +- .ci_support/environment-mini.yml | 2 +- .ci_support/environment.yml | 2 +- binder/environment.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_support/environment-docs.yml b/.ci_support/environment-docs.yml index 488783fd4..66253bbd5 100644 --- a/.ci_support/environment-docs.yml +++ b/.ci_support/environment-docs.yml @@ -12,7 +12,7 @@ dependencies: - h5io_browser =0.1.5 - h5py =3.12.1 - jinja2 =3.1.5 -- monty =2024.12.10 +- monty =2025.1.9 - numpy =2.2.1 - pandas =2.2.3 - pint =0.24.4 diff --git a/.ci_support/environment-mini.yml b/.ci_support/environment-mini.yml index 3a265d99d..9d8c0ded0 100644 --- a/.ci_support/environment-mini.yml +++ b/.ci_support/environment-mini.yml @@ -4,7 +4,7 @@ dependencies: - cloudpickle =3.1.0 - h5io_browser =0.1.5 - h5py =3.12.1 -- monty =2024.12.10 +- monty =2025.1.9 - numpy =2.2.1 - pandas =2.2.3 - psutil =6.1.1 diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index 681c7ed7e..357f72825 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -10,7 +10,7 @@ dependencies: - h5io_browser =0.1.5 - h5py =3.12.1 - jinja2 =3.1.5 -- monty =2024.12.10 +- monty =2025.1.9 - numpy =2.2.1 - pandas =2.2.3 - pint =0.24.4 diff --git a/binder/environment.yml b/binder/environment.yml index ec0485615..1ff33c3e6 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -9,7 +9,7 @@ dependencies: - h5io_browser =0.1.5 - h5py =3.12.1 - jinja2 =3.1.5 -- monty =2024.12.10 +- monty =2025.1.9 - numpy =2.2.1 - pandas =2.2.3 - pint =0.24.4 From ec12a0997f9438f87d9f2631f9a94e21ee2c6fe8 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 20 Jan 2025 18:40:56 +0100 Subject: [PATCH 3/6] Monty fixes --- tests/unit/job/test_genericJob.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/job/test_genericJob.py b/tests/unit/job/test_genericJob.py index 256de7fcf..60cc1deaa 100644 --- a/tests/unit/job/test_genericJob.py +++ b/tests/unit/job/test_genericJob.py @@ -98,7 +98,7 @@ def test_compress_file_list(self): os.makedirs(ham.working_directory, exist_ok=True) for file in file_lst: with open(os.path.join(ham.working_directory, file), "w") as f: - f.writelines(["content: " + file]) + f.writelines(["content: " + file + "\n"]) for file in file_lst: self.assertTrue(file in ham.files.list()) for file in file_lst: @@ -762,7 +762,7 @@ def test_tail(self): job.decompress() content = ["Content", "More", "Lines"] with open(os.path.join(job.working_directory, "test_file"), "w") as f: - f.write(os.linesep.join(content)) + f.write(os.linesep.join(content) + "\n") for i in range(len(content)): with self.subTest(i=i): From 7661b58aecb9f8d039379fcbcdc2dd9794a4a22d Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 20 Jan 2025 18:45:58 +0100 Subject: [PATCH 4/6] fix for minimal test --- tests/unit/job/test_genericJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/job/test_genericJob.py b/tests/unit/job/test_genericJob.py index 60cc1deaa..8559e44a9 100644 --- a/tests/unit/job/test_genericJob.py +++ b/tests/unit/job/test_genericJob.py @@ -115,7 +115,7 @@ def test_compress_file_list(self): ) with contextlib.redirect_stdout(io.StringIO(newline=os.linesep)) as f: ham.files.file_to_compress.tail() - self.assertEqual(f.getvalue().replace("\r", ""), "content: file_to_compress\n") + self.assertEqual(f.getvalue().replace("\r", "").replace("\n", ""), "content: file_to_compress") ham.remove() def test_job_name(self): From 40c5d28462127adf0e78ca485a08f04ec33fbef3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 17:47:45 +0000 Subject: [PATCH 5/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/unit/job/test_genericJob.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unit/job/test_genericJob.py b/tests/unit/job/test_genericJob.py index 8559e44a9..37495ceeb 100644 --- a/tests/unit/job/test_genericJob.py +++ b/tests/unit/job/test_genericJob.py @@ -115,7 +115,10 @@ def test_compress_file_list(self): ) with contextlib.redirect_stdout(io.StringIO(newline=os.linesep)) as f: ham.files.file_to_compress.tail() - self.assertEqual(f.getvalue().replace("\r", "").replace("\n", ""), "content: file_to_compress") + self.assertEqual( + f.getvalue().replace("\r", "").replace("\n", ""), + "content: file_to_compress", + ) ham.remove() def test_job_name(self): From 4fb06a2dc8042de5ac0d7e18991e3a3a4c3fa8d2 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 20 Jan 2025 19:03:17 +0100 Subject: [PATCH 6/6] Update environment-old.yml --- .ci_support/environment-old.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment-old.yml b/.ci_support/environment-old.yml index 9df7492d0..122806c14 100644 --- a/.ci_support/environment-old.yml +++ b/.ci_support/environment-old.yml @@ -6,7 +6,7 @@ dependencies: - h5io_browser =0.0.14 - h5py =3.6.0 - jinja2 =2.11.3 -- monty =2021.3.3 +- monty =2025.1.3 - numpy =1.23.5 - pandas =2.0.0 - pint =0.18