Fix Android tests #23
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhsmith
commented
Jun 11, 2025
tools/pybind11NewTools.cmake
Outdated
Comment on lines
246
to
247
| # Older versions of CMake don't know that Android requires modules to link to | ||
| # libpython, so they generate Python::Module as an INTERFACE library. |
There was a problem hiding this comment.
I'll submit a PR in the next couple of days to fix this upstream in CMake. The necessary change in FindPython/Support.cmake is quite simple:
@@ -1515,13 +1515,13 @@ unset (_${_PYTHON_PREFIX}_FIND_DEVELOPMENT_MODULE_ARTIFACTS)
unset (_${_PYTHON_PREFIX}_FIND_DEVELOPMENT_SABIMODULE_ARTIFACTS)
unset (_${_PYTHON_PREFIX}_FIND_DEVELOPMENT_EMBED_ARTIFACTS)
if ("Development.Module" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
- if (CMAKE_SYSTEM_NAME MATCHES "^(Windows.*|CYGWIN|MSYS)$")
+ if (CMAKE_SYSTEM_NAME MATCHES "^(Windows.*|CYGWIN|MSYS|Android)$")
list (APPEND _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_MODULE_ARTIFACTS "LIBRARY")
endif()
list (APPEND _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_MODULE_ARTIFACTS "INCLUDE_DIR")
endif()
if ("Development.SABIModule" IN_LIST ${_PYTHON_BASE}_FIND_COMPONENTS)
- if (CMAKE_SYSTEM_NAME MATCHES "^(Windows.*|CYGWIN|MSYS)$")
+ if (CMAKE_SYSTEM_NAME MATCHES "^(Windows.*|CYGWIN|MSYS|Android)$")
list (APPEND _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_SABIMODULE_ARTIFACTS "SABI_LIBRARY")
endif()
list (APPEND _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_SABIMODULE_ARTIFACTS "INCLUDE_DIR")
Comment on lines
-36
to
-37
| android.test-groups = ["numpy"] | ||
| android.xbuild-tools = ["cmake", "ninja"] |
There was a problem hiding this comment.
android.test-groups = ["numpy"]
Unfortunately the Chaquopy NumPy wheel won't work with the CPython testbed, as it packages OpenBLAS in a Chaquopy-specific location.
android.xbuild-tools = ["cmake", "ninja"]
xbuild-tools is not implemented on Android: pypa/cibuildwheel#2349 (comment)
| @@ -76,7 +76,7 @@ def test_cross_module_exceptions(msg): | |||
|
|
|||
| # TODO: FIXME | |||
| @pytest.mark.xfail( | |||
| "env.MACOS and env.PYPY", | |||
| "(env.MACOS and env.PYPY) or env.ANDROID", | |||
There was a problem hiding this comment.
I don't understand what's going on here, but going by the linked issues and PRs, neither do the pybind11 maintainers, so I don't feel too bad.
henryiii
merged commit 75a86b8
into
henryiii:henryiii/ci/android
75 of 77 checks passed
henryiii
pushed a commit
that referenced
this pull request
Jun 12, 2025
* Android tests working * Clarifications
|
I get "wheel" missing. Going to see if I can inject it. |
henryiii
pushed a commit
that referenced
this pull request
Jun 18, 2025
* Android tests working * Clarifications
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For context, see:
I'll add some inline notes below.