Bump 25.7 version (#1730)

benflexcompute · flow360-auto-hotfix-bot · commit f083b632b20a · 2026-01-16T16:06:25.000Z
diff --git a/flow360/version.py b/flow360/version.py
@@ -2,5 +2,10 @@
 version
 """
 
+<<<<<<< HEAD
 __version__ = "25.8.3b1"
 __solver_version__ = "release-25.8"
+=======
+__version__ = "25.7.8"
+__solver_version__ = "release-25.7"
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,10 @@
 [tool.poetry]
 name = "flow360"
+<<<<<<< HEAD
 version = "v25.8.3b1"
+=======
+version = "v25.7.8"
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
 description = "Flow360 Python Client"
 authors = ["Flexcompute <support@flexcompute.com>"]
 
diff --git a/tests/ref/simulation/service_init_geometry.json b/tests/ref/simulation/service_init_geometry.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.3b1",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/ref/simulation/service_init_surface_mesh.json b/tests/ref/simulation/service_init_surface_mesh.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.3b1",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/ref/simulation/service_init_volume_mesh.json b/tests/ref/simulation/service_init_volume_mesh.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.3b1",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/simulation/converter/ref/ref_monitor.json b/tests/simulation/converter/ref/ref_monitor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.3b1",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/simulation/data/real_case_coefficients/results/simulation_params.json b/tests/simulation/data/real_case_coefficients/results/simulation_params.json
diff --git a/tests/simulation/data/simulation_by_face_id.json b/tests/simulation/data/simulation_by_face_id.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.3b1",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/simulation/params/data/geometry/simulation.json b/tests/simulation/params/data/geometry/simulation.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.0b4",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/simulation/ref/simulation_with_project_variables.json b/tests/simulation/ref/simulation_with_project_variables.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.3b1",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/simulation/service/data/simulation.json b/tests/simulation/service/data/simulation.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.0b4",
+=======
+    "version": "25.7.8b0",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "CGS"
     },
diff --git a/tests/simulation/service/params.json b/tests/simulation/service/params.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "version": "25.8.0b4",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git 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,9 @@
 {
+<<<<<<< HEAD
     "version": "99.9.9",
+=======
+    "version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
     "unit_system": {
         "name": "SI"
     },
diff --git a/tests/simulation/translator/data/ghost_periodic_geometry_entity_info/simulation.json b/tests/simulation/translator/data/ghost_periodic_geometry_entity_info/simulation.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
 	"version": "25.8.0b4",
+=======
+	"version": "25.7.8",
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
 	"unit_system": {
 		"name": "SI"
 	},
diff --git a/tests/test_current_flow360_version.py b/tests/test_current_flow360_version.py
@@ -2,4 +2,8 @@
 
 
 def test_version():
+<<<<<<< HEAD
     assert __version__ == "25.8.3b1"
+=======
+    assert __version__ == "25.7.8"
+>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
