From 0745a91b08a3f076a9c7aee202999ffa43a96d21 Mon Sep 17 00:00:00 2001 From: benflexcompute Date: Tue, 3 Mar 2026 14:08:04 -0500 Subject: [PATCH 1/3] Bump to 25.9.2 for preparation of spliting the RotationVolume class --- flow360/version.py | 2 +- pyproject.toml | 2 +- tests/ref/simulation/service_init_geometry.json | 1 - tests/ref/simulation/service_init_surface_mesh.json | 1 - tests/ref/simulation/service_init_volume_mesh.json | 1 - tests/simulation/converter/ref/ref_monitor.json | 1 - tests/simulation/converter/test_monitor_flow360_converter.py | 2 +- tests/simulation/data/geometry_airplane/simulation.json | 1 - tests/simulation/data/simulation_by_face_id.json | 1 - tests/simulation/ref/simulation_with_project_variables.json | 2 +- .../service/data/dependency_geometry_sphere1_simulation.json | 3 +-- .../service/data/dependency_geometry_sphere2_simulation.json | 3 +-- .../simulation/service/data/root_geometry_cube_simulation.json | 3 +-- tests/simulation/test_project.py | 3 +++ .../translator/data/gai_mirror_entity_info/simulation.json | 2 +- .../data/gai_windtunnel_farfield_info/simulation.json | 1 - tests/test_current_flow360_version.py | 2 +- tests/utils.py | 2 ++ 18 files changed, 14 insertions(+), 19 deletions(-) diff --git a/flow360/version.py b/flow360/version.py index ca540d516..9ec78cb14 100644 --- a/flow360/version.py +++ b/flow360/version.py @@ -2,5 +2,5 @@ version """ -__version__ = "25.9.1b1" +__version__ = "25.9.2b1" __solver_version__ = "release-25.8" diff --git a/pyproject.toml b/pyproject.toml index 83b2431c3..32aeb9b94 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "flow360" -version = "v25.9.1b1" +version = "v25.9.2b1" description = "Flow360 Python Client" authors = ["Flexcompute "] diff --git a/tests/ref/simulation/service_init_geometry.json b/tests/ref/simulation/service_init_geometry.json index fe63d2e96..589a24f18 100644 --- a/tests/ref/simulation/service_init_geometry.json +++ b/tests/ref/simulation/service_init_geometry.json @@ -1,5 +1,4 @@ { - "version": "25.9.1b1", "unit_system": { "name": "SI" }, diff --git a/tests/ref/simulation/service_init_surface_mesh.json b/tests/ref/simulation/service_init_surface_mesh.json index 57d70cd67..4636ed965 100644 --- a/tests/ref/simulation/service_init_surface_mesh.json +++ b/tests/ref/simulation/service_init_surface_mesh.json @@ -1,5 +1,4 @@ { - "version": "25.9.1b1", "unit_system": { "name": "SI" }, diff --git a/tests/ref/simulation/service_init_volume_mesh.json b/tests/ref/simulation/service_init_volume_mesh.json index d72866251..6c754df93 100644 --- a/tests/ref/simulation/service_init_volume_mesh.json +++ b/tests/ref/simulation/service_init_volume_mesh.json @@ -1,5 +1,4 @@ { - "version": "25.9.1b1", "unit_system": { "name": "SI" }, diff --git a/tests/simulation/converter/ref/ref_monitor.json b/tests/simulation/converter/ref/ref_monitor.json index b79ef584d..0b35e4094 100644 --- a/tests/simulation/converter/ref/ref_monitor.json +++ b/tests/simulation/converter/ref/ref_monitor.json @@ -1,5 +1,4 @@ { - "version": "25.9.1b1", "unit_system": { "name": "SI" }, diff --git a/tests/simulation/converter/test_monitor_flow360_converter.py b/tests/simulation/converter/test_monitor_flow360_converter.py index d48c520a4..422652f67 100644 --- a/tests/simulation/converter/test_monitor_flow360_converter.py +++ b/tests/simulation/converter/test_monitor_flow360_converter.py @@ -53,7 +53,7 @@ def test_flow360_monitor_convert(): with open("./ref/ref_monitor.json", mode="r") as fp: ref_dict = json.load(fp=fp) - assert compare_values(params_dict, ref_dict) + assert compare_values(params_dict, ref_dict, ignore_keys={"version"}) with pytest.raises( ValueError, diff --git a/tests/simulation/data/geometry_airplane/simulation.json b/tests/simulation/data/geometry_airplane/simulation.json index 517fb7d79..9db6c188f 100644 --- a/tests/simulation/data/geometry_airplane/simulation.json +++ b/tests/simulation/data/geometry_airplane/simulation.json @@ -1,5 +1,4 @@ { - "version": "25.9.1b1", "unit_system": { "name": "SI" }, diff --git a/tests/simulation/data/simulation_by_face_id.json b/tests/simulation/data/simulation_by_face_id.json index 7d95565cc..2c91b602b 100644 --- a/tests/simulation/data/simulation_by_face_id.json +++ b/tests/simulation/data/simulation_by_face_id.json @@ -1,5 +1,4 @@ { - "version": "25.9.1b1", "unit_system": { "name": "SI" }, diff --git a/tests/simulation/ref/simulation_with_project_variables.json b/tests/simulation/ref/simulation_with_project_variables.json index 3c1d67f9c..fc70ae15a 100644 --- a/tests/simulation/ref/simulation_with_project_variables.json +++ b/tests/simulation/ref/simulation_with_project_variables.json @@ -1,5 +1,5 @@ { - "version": "25.9.1b1", + "version": "25.9.2b1", "unit_system": { "name": "SI" }, diff --git a/tests/simulation/service/data/dependency_geometry_sphere1_simulation.json b/tests/simulation/service/data/dependency_geometry_sphere1_simulation.json index a87546f33..09483b492 100644 --- a/tests/simulation/service/data/dependency_geometry_sphere1_simulation.json +++ b/tests/simulation/service/data/dependency_geometry_sphere1_simulation.json @@ -742,6 +742,5 @@ "unit_system": { "name": "SI" }, - "user_defined_fields": [], - "version": "25.9.1b1" + "user_defined_fields": [] } \ No newline at end of file diff --git a/tests/simulation/service/data/dependency_geometry_sphere2_simulation.json b/tests/simulation/service/data/dependency_geometry_sphere2_simulation.json index 43f59cefe..4a7a74dce 100644 --- a/tests/simulation/service/data/dependency_geometry_sphere2_simulation.json +++ b/tests/simulation/service/data/dependency_geometry_sphere2_simulation.json @@ -742,6 +742,5 @@ "unit_system": { "name": "SI" }, - "user_defined_fields": [], - "version": "25.9.1b1" + "user_defined_fields": [] } \ No newline at end of file diff --git a/tests/simulation/service/data/root_geometry_cube_simulation.json b/tests/simulation/service/data/root_geometry_cube_simulation.json index dc27ad12e..a3a6279d9 100644 --- a/tests/simulation/service/data/root_geometry_cube_simulation.json +++ b/tests/simulation/service/data/root_geometry_cube_simulation.json @@ -1150,6 +1150,5 @@ "unit_system": { "name": "SI" }, - "user_defined_fields": [], - "version": "25.9.1b1" + "user_defined_fields": [] } \ No newline at end of file diff --git a/tests/simulation/test_project.py b/tests/simulation/test_project.py index 6e7d92eb4..0e8605f0c 100644 --- a/tests/simulation/test_project.py +++ b/tests/simulation/test_project.py @@ -169,6 +169,9 @@ def test_conflicting_entity_grouping_tags(mock_response, capsys): ) as f: params_as_dict = json.load(f) + from flow360.version import __version__ + + params_as_dict["version"] = __version__ params, errors, _ = validate_model( params_as_dict=params_as_dict, validated_by=ValidationCalledBy.LOCAL, diff --git a/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json b/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json index ea32b67d6..a4ba3c864 100644 --- a/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json +++ b/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json @@ -1,5 +1,5 @@ { - "version": "25.9.1b1", + "version": "99.9.9", "unit_system": { "name": "SI" }, diff --git a/tests/simulation/translator/data/gai_windtunnel_farfield_info/simulation.json b/tests/simulation/translator/data/gai_windtunnel_farfield_info/simulation.json index ca15bc8e3..f75640ce6 100644 --- a/tests/simulation/translator/data/gai_windtunnel_farfield_info/simulation.json +++ b/tests/simulation/translator/data/gai_windtunnel_farfield_info/simulation.json @@ -1,5 +1,4 @@ { - "version": "25.9.1b1", "unit_system": { "name": "SI" }, diff --git a/tests/test_current_flow360_version.py b/tests/test_current_flow360_version.py index 704dac595..bd25501b6 100644 --- a/tests/test_current_flow360_version.py +++ b/tests/test_current_flow360_version.py @@ -2,4 +2,4 @@ def test_version(): - assert __version__ == "25.9.1b1" + assert __version__ == "25.9.2b1" diff --git a/tests/utils.py b/tests/utils.py index ef55f38e2..a393d1f74 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -76,6 +76,8 @@ def to_file_from_file_test(obj): def compare_dict_to_ref(data, ref_path): with open(ref_path) as fh: ref_data = json.load(fh) + data.pop("version", None) + ref_data.pop("version", None) equal = sorted(data.items()) == sorted(ref_data.items()) if equal is False: show_dict_diff(data, ref_data) From 89f474647d81c41f3a8afb209bc6b6a9dd1b284b Mon Sep 17 00:00:00 2001 From: benflexcompute Date: Tue, 3 Mar 2026 14:15:38 -0500 Subject: [PATCH 2/3] Comment addressed --- tests/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/utils.py b/tests/utils.py index a393d1f74..bbebbe46c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -76,8 +76,8 @@ def to_file_from_file_test(obj): def compare_dict_to_ref(data, ref_path): with open(ref_path) as fh: ref_data = json.load(fh) - data.pop("version", None) - ref_data.pop("version", None) + data = {k: v for k, v in data.items() if k != "version"} + ref_data = {k: v for k, v in ref_data.items() if k != "version"} equal = sorted(data.items()) == sorted(ref_data.items()) if equal is False: show_dict_diff(data, ref_data) From 174716c601438770fee7f7ae6670e13da15f08c8 Mon Sep 17 00:00:00 2001 From: benflexcompute Date: Tue, 3 Mar 2026 15:05:45 -0500 Subject: [PATCH 3/3] Comment addressed --- .../translator/data/gai_geometry_entity_info/simulation.json | 2 +- .../translator/data/gai_mirror_entity_info/simulation.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/simulation/translator/data/gai_geometry_entity_info/simulation.json b/tests/simulation/translator/data/gai_geometry_entity_info/simulation.json index 0fcb0a0e6..e133c3ad3 100644 --- a/tests/simulation/translator/data/gai_geometry_entity_info/simulation.json +++ b/tests/simulation/translator/data/gai_geometry_entity_info/simulation.json @@ -1,5 +1,5 @@ { - "version": "99.9.9", + "version": "25.9.1", "unit_system": { "name": "SI" }, diff --git a/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json b/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json index a4ba3c864..f132d17f6 100644 --- a/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json +++ b/tests/simulation/translator/data/gai_mirror_entity_info/simulation.json @@ -1,5 +1,5 @@ { - "version": "99.9.9", + "version": "25.9.1", "unit_system": { "name": "SI" },