Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ services:
clang_tools: ${CLANG_TOOLS}
llvm: ${LLVM}
pyodide_version: "0.26.0"
chrome_version: "148"
chrome_version: "latest"
selenium_version: "4.41.0"
required_python_min: "(3,12)"
python: ${PYTHON}
Expand Down
5 changes: 4 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2073,7 +2073,10 @@ function(build_protobuf)
"-DCMAKE_C_FLAGS="
"-DCMAKE_INSTALL_PREFIX=${PROTOBUF_HOST_PREFIX}"
-Dprotobuf_BUILD_TESTS=OFF
-Dprotobuf_DEBUG_POSTFIX=)
-Dprotobuf_DEBUG_POSTFIX=
# OFF so protobuf does not take conda's zlib and add its include dir
# globally, causing vendored Abseil sources to include env's old headers
-Dprotobuf_WITH_ZLIB=OFF)
if(ABSL_VENDORED)
# Force protobuf to reuse Arrow's already-extracted absl source
# so we don't re-download and we don't have issues with multiple abseil.
Expand Down
8 changes: 8 additions & 0 deletions python/scripts/run_emscripten_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,14 @@ def _load_pyarrow_in_runner(driver, wheel_name):
await pjs.loadPackage("numpy")
await pjs.loadPackage("pandas")
import pytest
import inspect
if "exc_type" not in inspect.signature(pytest.importorskip).parameters:
_original_importorskip = pytest.importorskip
def _importorskip(modname, minversion=None, reason=None, *,
exc_type=ImportError):
return _original_importorskip(modname, minversion=minversion,
reason=reason)
pytest.importorskip = _importorskip
import pandas # import pandas after pyarrow package load for pandas/pyarrow
# functions to work
import pyarrow
Expand Down
Loading