roms-tools 2.2.0__py3-none-any.whl → 2.2.1__py3-none-any.whl

roms_tools/setup/utils.py

@@ -1080,8 +1080,18 @@ def _to_yaml(forcing_object, filepath: Union[str, Path]) -> None:
         grid_yaml_data = {**parent_grid_yaml_data, **child_grid_yaml_data}
 
     # Ensure forcing_object.source.path is a string (convert if it's a pathlib object)
-    if hasattr(forcing_object, "source") and "path" in forcing_object.source:
+    if (
+        hasattr(forcing_object, "source")
+        and forcing_object.source is not None
+        and "path" in forcing_object.source
+    ):
         forcing_object.source["path"] = str(forcing_object.source["path"])
+    if (
+        hasattr(forcing_object, "bgc_source")
+        and forcing_object.bgc_source is not None
+        and "path" in forcing_object.bgc_source
+    ):
+        forcing_object.bgc_source["path"] = str(forcing_object.bgc_source["path"])
 
     # Step 2: Get ROMS Tools version
     # Fetch the version of the 'roms-tools' package for inclusion in the YAML header

roms_tools/tests/test_setup/test_initial_conditions.py

@@ -250,7 +250,9 @@ def test_initial_conditions_save(
                 expected_filepath.unlink()
 
 
-def test_roundtrip_yaml(initial_conditions, tmp_path, use_dask):
+def test_roundtrip_yaml(
+    initial_conditions_with_bgc_from_climatology, tmp_path, use_dask
+):
     """Test that creating an InitialConditions object, saving its parameters to yaml
     file, and re-opening yaml file creates the same object."""
 
@@ -261,13 +263,15 @@ def test_roundtrip_yaml(initial_conditions, tmp_path, use_dask):
         str(tmp_path / file_str),
     ]:  # test for Path object and str
 
-        initial_conditions.to_yaml(filepath)
+        initial_conditions_with_bgc_from_climatology.to_yaml(filepath)
 
         initial_conditions_from_file = InitialConditions.from_yaml(
             filepath, use_dask=use_dask
         )
 
-        assert initial_conditions == initial_conditions_from_file
+        assert (
+            initial_conditions_with_bgc_from_climatology == initial_conditions_from_file
+        )
 
         filepath = Path(filepath)
         filepath.unlink()

{roms_tools-2.2.0.dist-info → roms_tools-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: roms-tools
-Version: 2.2.0
+Version: 2.2.1
 Summary: Tools for running and analysing UCLA-ROMS simulations
 Author-email: Nora Loose <nora.loose@gmail.com>, Thomas Nicholas <tom@cworthy.org>
 License: Apache-2

{roms_tools-2.2.0.dist-info → roms_tools-2.2.1.dist-info}/RECORD

@@ -16,7 +16,7 @@ roms_tools/setup/river_forcing.py,sha256=Ox61M_SNousC_FLwmBoR865oiTyisbvJb4bcEaJ
 roms_tools/setup/surface_forcing.py,sha256=-i2lAxv_vhjO2QQyWPfLg1mIIOx4N0VDmMUrkI1V0qQ,21409
 roms_tools/setup/tides.py,sha256=EgsPsLY70ERB6q2w1DClRQZvSbX-i_Ypume01Ub_EYU,28257
 roms_tools/setup/topography.py,sha256=pKf2EmUc85meKN5aDkN1fY2U3Zn5nn80RDqzaEfpvvw,13475
-roms_tools/setup/utils.py,sha256=1WzeRF8hf-00cnh2M73nsyvMQxDfHqXF2AMI947iyDk,46494
+roms_tools/setup/utils.py,sha256=baNIkZXKJFA1OlPKwf7UOP8J2rXIBDMbXlDhokkyyw0,46807
 roms_tools/setup/vertical_coordinate.py,sha256=yw3L_ONELAZfOHwNvcyQaJ0Vqir05FRzFBd601eTLUM,2689
 roms_tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 roms_tools/tests/test_utils.py,sha256=X16UHYzd8KmUgxBHJqmVP6cIHfOtScCdXPw905bgGMk,7966
@@ -25,7 +25,7 @@ roms_tools/tests/test_setup/test_boundary_forcing.py,sha256=izCr5zRLtCsbWa2jjEvu
 roms_tools/tests/test_setup/test_datasets.py,sha256=Pxh95V-x-EaemVm6F_T0TbtrEp4Lh1_OAaOxPwTLrfQ,16441
 roms_tools/tests/test_setup/test_fill.py,sha256=gDHuM58d3ECQE317ZntChYt4hWCfo4eVhkW13NiZ1V4,3735
 roms_tools/tests/test_setup/test_grid.py,sha256=oGRiM2mqKuQavlS0C52ambLURu64Yc7zwaKYQxt5tOk,14663
-roms_tools/tests/test_setup/test_initial_conditions.py,sha256=IFEUgice0hWPKQkQg44d5CJNJ-Cli1vYCK8a0kVAcvM,11201
+roms_tools/tests/test_setup/test_initial_conditions.py,sha256=8UYTSmQHDNO9omGI7l5xXGyZ8VHOwdVsuyEs-iHyMTg,11309
 roms_tools/tests/test_setup/test_nesting.py,sha256=_LB_10XgGkQ6DmpHp5rgIWTEN6nR14aZY8B_ADX4cRQ,18525
 roms_tools/tests/test_setup/test_regrid.py,sha256=NMzMkPHaFfO_9H0SbIpFL3VHlzhd71gUVLu81QmU-bs,1891
 roms_tools/tests/test_setup/test_river_forcing.py,sha256=K0XoT8sIbqoFGyIkK6oPOPpihAJftXrcsymV2q5tD6o,12010
@@ -1048,8 +1048,8 @@ roms_tools/tests/test_setup/test_data/tidal_forcing.zarr/v_Im/0.0.0,sha256=60jWZ
 roms_tools/tests/test_setup/test_data/tidal_forcing.zarr/v_Re/.zarray,sha256=2P8kKjSgdw5-3udU-vGJ3bzhNuRn7fZmWN811qBJn34,357
 roms_tools/tests/test_setup/test_data/tidal_forcing.zarr/v_Re/.zattrs,sha256=2z7WUPvCT9VfFs8VCBltFHLWgaGj1jcw3yZ4n0viLRg,197
 roms_tools/tests/test_setup/test_data/tidal_forcing.zarr/v_Re/0.0.0,sha256=33Gl8otBmgqVarmAnZuEqTYS2_hVJUJh-iN1HzvaDuo,96
-roms_tools-2.2.0.dist-info/LICENSE,sha256=yiff76E4xRioW2bHhlPpyYpstmePQBx2bF8HhgQhSsg,11318
-roms_tools-2.2.0.dist-info/METADATA,sha256=ez12LSQgsVdNz-ujYb7B26bIgVYhDi35_ZJRjPYEpEI,4244
-roms_tools-2.2.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-roms_tools-2.2.0.dist-info/top_level.txt,sha256=aAf4T4nYQSkay5iKJ9kmTjlDgd4ETdp9OSlB4sJdt8Y,19
-roms_tools-2.2.0.dist-info/RECORD,,
+roms_tools-2.2.1.dist-info/LICENSE,sha256=yiff76E4xRioW2bHhlPpyYpstmePQBx2bF8HhgQhSsg,11318
+roms_tools-2.2.1.dist-info/METADATA,sha256=2J9nvZ1qgY7BnN4e8n7-pyw0P4dddCcRwJNul51A8sE,4244
+roms_tools-2.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+roms_tools-2.2.1.dist-info/top_level.txt,sha256=aAf4T4nYQSkay5iKJ9kmTjlDgd4ETdp9OSlB4sJdt8Y,19
+roms_tools-2.2.1.dist-info/RECORD,,