From 34e204ade40272486651778f3c40137ecd949b58 Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Wed, 11 Sep 2024 08:33:35 -0500 Subject: [PATCH 1/3] fix: use new pydantic settings --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2eb418d82b..fd0ce5057c 100644 --- a/setup.py +++ b/setup.py @@ -110,7 +110,7 @@ "pandas>=2.2.2,<3", "pluggy>=1.3,<2", "pydantic>=2.6.4,<3", - "pydantic-settings>=2.4.0,<2.5", # Bug in pydantic_settings + "pydantic-settings>=2.5.2,<2.6", "pytest>=8.0,<9.0", "python-dateutil>=2.8.2,<3", "PyYAML>=5.0,<7", From b0214e38799e6933f8a38358b0028ac399db206a Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Wed, 11 Sep 2024 11:23:00 -0500 Subject: [PATCH 2/3] chore: up pin --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fd0ce5057c..e00825915d 100644 --- a/setup.py +++ b/setup.py @@ -110,7 +110,7 @@ "pandas>=2.2.2,<3", "pluggy>=1.3,<2", "pydantic>=2.6.4,<3", - "pydantic-settings>=2.5.2,<2.6", + "pydantic-settings>=2.5.2,<3", "pytest>=8.0,<9.0", "python-dateutil>=2.8.2,<3", "PyYAML>=5.0,<7", From c7b819a282c0a012a6da0199b4ae8899658fb47e Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Wed, 11 Sep 2024 12:27:15 -0500 Subject: [PATCH 3/3] test: make test play nicer --- tests/functional/test_project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/functional/test_project.py b/tests/functional/test_project.py index 9da19395b2..99436d0570 100644 --- a/tests/functional/test_project.py +++ b/tests/functional/test_project.py @@ -158,12 +158,13 @@ def test_isolate_in_tempdir_does_not_alter_sources(project): try: with project.isolate_in_tempdir() as tmp_project: # The new (bad) source should be in the temp project. - assert "tests/newsource.json" in (tmp_project.manifest.sources or {}), project.path + actual = {**(tmp_project.manifest.sources or {})} finally: new_src.unlink() project.sources.refresh() # Ensure "newsource" did not persist in the in-memory manifest. + assert "tests/newsource.json" in actual, project.path assert "tests/newsource.json" not in (project.manifest.sources or {})