dedebenui/scgenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix in data file bundling

Browse Source
This commit is contained in:
dedebenui
2024-02-15 11:53:13 +01:00
parent 3e57d5ffc5
commit 866f8cd2ff
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/scgenerator/spectra.py
View File

@@ -566,9 +566,10 @@ def _create_new_propagation(
io: PropagationIOHandler, params: Parameters, bundle_data: bool io: PropagationIOHandler, params: Parameters, bundle_data: bool
) -> Propagation: ) -> Propagation:
if params.frozen: if params.frozen:
params = params.copy() params = params.copy(deep=True)
else: else:
params = params.compile(exhaustive=True, strict=False) params = params.copy(deep=True)
params.compile_in_place(exhaustive=True, strict=False)
if bundle_data: if bundle_data:
_bundle_external_files(params, io) _bundle_external_files(params, io)
io.save_data(PARAMS_FN, params.to_json().encode()) io.save_data(PARAMS_FN, params.to_json().encode())

12
tests/test_io_handlers.py
View File

@@ -142,11 +142,15 @@ def test_zip_bundle(tmp_path: Path):
params.freeze() params.freeze()
prop2 = propagation(tmp_path / "file3.zip", params, bundle_data=True) prop2 = propagation(tmp_path / "file3.zip", params, bundle_data=True)
assert prop2.parameters is not params
assert prop2.parameters.dispersion_file is not params.dispersion_file
assert prop2.parameters.dispersion_file.path == new_disp_path.name prop3 = propagation(tmp_path / "file3.zip")
assert prop2.parameters.dispersion_file.prefix == "zip"
assert prop2.parameters.effective_area_file.path == new_aeff_path.name assert prop3.parameters.dispersion_file.path == new_disp_path.name
assert prop2.parameters.effective_area_file.prefix == "zip" assert prop3.parameters.dispersion_file.prefix == "zip"
assert prop3.parameters.effective_area_file.path == new_aeff_path.name
assert prop3.parameters.effective_area_file.prefix == "zip"
with ZipFile(tmp_path / "file3.zip", "r") as zfile: with ZipFile(tmp_path / "file3.zip", "r") as zfile:
with zfile.open(new_aeff_path.name) as file: with zfile.open(new_aeff_path.name) as file: