Skip to content

[Hotfix Main]: Bump 25.7 version #1731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
github-actions wants to merge 1 commit into from
Closed

[Hotfix Main]: Bump 25.7 version #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions flow360/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
4 changes: 4 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>"]

Expand Down
4 changes: 4 additions & 0 deletions tests/ref/simulation/service_init_geometry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.3b1",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/ref/simulation/service_init_surface_mesh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.3b1",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/ref/simulation/service_init_volume_mesh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.3b1",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/converter/ref/ref_monitor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.3b1",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/data/real_case_coefficients/results/simulation_params.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions tests/simulation/data/simulation_by_face_id.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.3b1",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/params/data/geometry/simulation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.0b4",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/ref/simulation_with_project_variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.3b1",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/service/data/simulation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.0b4",
=======
"version": "25.7.8b0",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "CGS"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/service/params.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.0b4",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/translator/data/gai_geometry_entity_info/simulation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "99.9.9",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/simulation/translator/data/ghost_periodic_geometry_entity_info/simulation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
<<<<<<< HEAD
"version": "25.8.0b4",
=======
"version": "25.7.8",
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))
"unit_system": {
"name": "SI"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/test_current_flow360_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@


def test_version():
<<<<<<< HEAD
assert __version__ == "25.8.3b1"
=======
assert __version__ == "25.7.8"
>>>>>>> 19a9ea25 (Bump 25.7 version (#1730))