Skip to content

Commit

Permalink
[CI] upgrade pybind11 2.13.6
Browse files Browse the repository at this point in the history
  • Loading branch information
tttapa committed Nov 13, 2024
1 parent a2325c9 commit 502b476
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wheel-short-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
config = ["${{ matrix.config }}"]
generator = "Ninja Multi-Config"
[cmake.options]
CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master"
CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen-master"
USE_GLOBAL_PYBIND11 = "On"
EOF
python${{ env.PYTHON_VERSION }} -m build -w . \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wheel-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
-D CMAKE_CXX_COMPILER="$staging/x-tools/$host/bin/$host-g++" \
-D CMAKE_Fortran_COMPILER="$staging/x-tools/$host/bin/$host-gfortran" \
-D USE_GLOBAL_PYBIND11=On \
-D CMAKE_FIND_ROOT_PATH="$staging/pybind11;$staging/eigen-master"
-D CMAKE_FIND_ROOT_PATH="$staging/pybind11-2.13.6;$staging/eigen-master"
$pbc_cli -B native-build build -- -t ${{ env.C_EXTENSIONS }}
$pbc_cli -B native-build install --component python_stubs -- --prefix "$PWD/staging/QPALM/interfaces/python"
tar cf stubs.tar -C "$PWD/staging" QPALM/interfaces/python
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
config = ["Debug", "Release"]
generator = "Ninja Multi-Config"
[cmake.options]
CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master"
CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen-master"
USE_GLOBAL_PYBIND11 = "On"
EOF
python${{ matrix.python-version }} -m build -w . \
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
config = ["Debug"]
generator = "Ninja Multi-Config"
[cmake.options]
CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master"
CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen-master"
USE_GLOBAL_PYBIND11 = "On"
EOF
python${{ env.PYTHON_VERSION }} -m build . \
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def requirements(self):
if self.options.with_cxx:
self.requires("eigen/3.4.0", transitive_headers=True)
if self.options.with_python:
self.requires("pybind11/2.11.1")
self.requires("pybind11/2.13.6")

def config_options(self):
if self.settings.get_safe("os") == "Windows":
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/local-cross-build-wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cat > $cross_config <<- EOF
config = ["Debug", "Release"]
generator = "Ninja Multi-Config"
[cmake.options]
CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen"
CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen"
USE_GLOBAL_PYBIND11 = "On"
EOF
export CFLAGS="-static-libgcc"
Expand Down

0 comments on commit 502b476

Please sign in to comment.