Skip to content

Commit

Permalink
Update CI infra (#57)
Browse files Browse the repository at this point in the history
Update pybind, cibuildwheel, x86_64 runner, add Python 3.13
  • Loading branch information
sarlinpe authored Nov 28, 2024
1 parent 25f7159 commit 477a507
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
config: [
{os: ubuntu-latest},
{os: macos-14, arch: x86_64},
{os: macos-13, arch: x86_64},
{os: macos-14, arch: arm64},
{os: windows-latest},
]
Expand Down Expand Up @@ -52,6 +52,7 @@ jobs:
echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" >> "$GITHUB_ENV"
echo "CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" >> "$GITHUB_ENV"
echo "CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}" >> "$GITHUB_ENV"
echo "ARCHFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES}" >> "$GITHUB_ENV"
# Fix: cibuildhweel cannot interpolate env variables.
CONFIG_SETTINGS="cmake.define.CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
Expand Down Expand Up @@ -118,8 +119,13 @@ jobs:
CIBW_MANYLINUX_X86_64_IMAGE="quay.io/pypa/manylinux_2_28_x86_64"
echo "CIBW_MANYLINUX_X86_64_IMAGE=${CIBW_MANYLINUX_X86_64_IMAGE}" >> "$GITHUB_ENV"
- name: Install ARM64 Python 3.8
uses: actions/setup-python@v5
with:
python-version: 3.8
if: runner.os == 'macOS' && runner.arch == 'ARM64' && ${{ matrix.config.arch }} == "arm64"
- name: Build wheels
uses: pypa/cibuildwheel@v2.19.2
uses: pypa/cibuildwheel@v2.22.0
env:
CIBW_ARCHS_MACOS: ${{ matrix.config.arch }}
- name: Archive wheels
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ find_package(Ceres 2.1 REQUIRED)

find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)

find_package(pybind11 2.11.1 REQUIRED)
find_package(pybind11 2.13.6 REQUIRED)

pybind11_add_module(pyceres _pyceres/bindings.cc)
target_include_directories(pyceres PRIVATE ${PROJECT_SOURCE_DIR})
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["scikit-build-core>=0.3.3", "pybind11==2.11.1"]
requires = ["scikit-build-core>=0.3.3", "pybind11==2.13.6"]
build-backend = "scikit_build_core.build"

[project]
Expand All @@ -21,15 +21,15 @@ classifiers = [
]

[tool.cibuildwheel]
build = "cp3{8,9,10,11,12}-{macosx,manylinux,win}*"
build = "cp3{8,9,10,11,12,13}-{macosx,manylinux,win}*"
archs = ["auto64"]
test-command = "python -c \"import pyceres; print(pyceres.__version__)\""

[tool.cibuildwheel.environment]
VCPKG_COMMIT_ID = "e01906b2ba7e645a76ee021a19de616edc98d29f"

[tool.cibuildwheel.linux]
before-all = "{package}/ci/install-ceres-centos.sh"
before-all = "{package}/ci/install-ceres-almalinux.sh"

[tool.cibuildwheel.macos]
before-all = "{package}/ci/install-ceres-macos.sh"
Expand Down

0 comments on commit 477a507

Please sign in to comment.