Skip to content

[Hotfix Main]: Update version #1941

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]: Update version #1941

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
4 changes: 4 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,9 @@
version
"""

<<<<<<< HEAD
__version__ = "25.10.0b1"
=======
__version__ = "25.9.6"
>>>>>>> fcd9ca7f (Update version (#1940))
__solver_version__ = "release-25.9"
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.10.0b1"
=======
version = "v25.9.6"
>>>>>>> fcd9ca7f (Update version (#1940))
description = "Flow360 Python Client"
authors = ["Flexcompute <support@flexcompute.com>"]

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
Expand Up @@ -421,5 +421,9 @@
"name": "SI"
},
"user_defined_fields": [],
<<<<<<< HEAD
"version": "25.9.3b1"
=======
"version": "25.9.6"
>>>>>>> fcd9ca7f (Update version (#1940))
}
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 @@ -4,6 +4,7 @@


def test_version():
<<<<<<< HEAD
assert __version__ == "25.10.0b1"


Expand All @@ -18,3 +19,6 @@ def test_solver_version_matches_module_version():
f"__solver_version__ is '{__solver_version__}' but expected '{expected}' "
f"for module version '{__version__}'"
)
=======
assert __version__ == "25.9.6"
>>>>>>> fcd9ca7f (Update version (#1940))