Skip to content

Commit

Permalink
Merge branch 'Python313' into 'master'
Browse files Browse the repository at this point in the history
[cmake] Set python version's upper limit to 3.13

See merge request ogs/ogs!5192
  • Loading branch information
Dmitry Yu. Naumov committed Jan 20, 2025
2 parents 018d092 + 626cd1c commit 1d6959f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion Tests/Data/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ pyvista[all]>=0.40.1
seaborn>=0.12
VTUinterface>=0.704
vtk-osmesa>=9.2.6;platform_system=='Linux'
git+https://github.com/drufat/triangle@5210b64ac5f2aff5673a66938cae56dc0a93a4ff#egg=triangle;platform_system=='Darwin'
3 changes: 1 addition & 2 deletions scripts/cmake/PythonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ if(OGS_USE_PIP)
execute_process(
COMMAND
${CMAKE_COMMAND} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR}
# TODO: set upper limit to <3.14 after 6.5.4. release
-Dpython_version=${ogs.minimum_version.python}...<3.13
-Dpython_version=${ogs.minimum_version.python}...<3.14
-DUV_TOOL_PATH=${UV_TOOL_PATH} -P
${PROJECT_SOURCE_DIR}/scripts/cmake/PythonCreateVirtualEnv.cmake
WORKING_DIRECTORY ${PROJECT_BINARY_DIR} COMMAND_ECHO STDOUT
Expand Down

0 comments on commit 1d6959f

Please sign in to comment.