Skip to content

Commit

Permalink
Merge branch 'wheel-313' into 'master'
Browse files Browse the repository at this point in the history
[ci] Build Python 3.13 wheels

See merge request ogs/ogs!5189
  • Loading branch information
bilke committed Dec 20, 2024
2 parents d72f48f + bc2bd16 commit 039ddd0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repository = "https://gitlab.opengeosys.org/ogs/ogs"
changelog = "https://gitlab.opengeosys.org/ogs/ogs/-/blob/master/CHANGELOG.md"

[project.optional-dependencies]
test = ["pytest", "numpy<2"]
test = ["pytest", "numpy"]

[tool.scikit-build]
build-dir = "_skbuild/{wheel_tag}"
Expand Down Expand Up @@ -53,7 +53,7 @@ python_files = ["test_*.py"]

[tool.cibuildwheel]
archs = "auto64"
build = ["cp3{9,10,11,12}-*"]
build = ["cp3{9,10,11,12,13}-*"]
skip = ["*musllinux*"]
test-extras = "test"
test-command = "pytest {project}/Tests/Python"
Expand Down
4 changes: 2 additions & 2 deletions scripts/cmake/CompilerSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
add_compile_options(-xHOST)
endif()

# Linker: prefer lld > gold > regular
# Linker: prefer mold > lld > gold > regular
foreach(linker mold lld gold)
execute_process(
COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=${linker} -Wl,--version
Expand All @@ -132,7 +132,7 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
add_link_options(-fuse-ld=lld)
message(STATUS "Using lld linker. (${_linker_version})")
break()
elseif("${_linker_version}" MATCHES "GNU gold")
elseif("${_linker_version}" MATCHES "GNU gold" AND NOT OGS_BUILD_WHEEL)
add_link_options(-fuse-ld=gold)
message(STATUS "Using GNU gold linker. (${_linker_version})")
break()
Expand Down

0 comments on commit 039ddd0

Please sign in to comment.