Skip to content
Merged
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
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ jobs:
PYODIDE_JOBS: ${{ steps.get-cores.outputs.CORES }}
working-directory: integration_tests
run: |

# https://github.com/pyodide/pyodide-build/issues/147
# disable package with scikit-build-core
if [[ ${{ matrix.os }} == "macos-latest" ]]; then
export RECIPE_BUILD_TARGET="*,!boost-histogram"
fi

if [[ "${{ matrix.task.installer }}" == "uv" ]]; then
export UV_RUN_PREFIX="uv run"
fi
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- The Rust toolchain version has been updated to `nightly-2025-01-18`.
[#103](https://github.com/pyodide/pyodide-build/pull/103)

- Removed `cmake` dependency from the package.
The Pyodide build system now uses the `cmake` package specified in the `pyproject.toml` file
of the target package.
[#141](https://github.com/pyodide/pyodide-build/pull/141)

### Fixed

- Fixed Pyodide venv `sys_platform` marker evaluation with pip >= 25.
Expand Down
7 changes: 6 additions & 1 deletion integration_tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ all:
test-recipe: check
@echo "... Running integration tests for building recipes"

$(UV_RUN_PREFIX) pyodide build-recipes --recipe-dir=recipes --install --force-rebuild "*"
@if [ -z "$(RECIPE_BUILD_TARGET)" ]; then \
RECIPE_TARGET='*'; \
else \
RECIPE_TARGET='$(RECIPE_BUILD_TARGET)'; \
fi; \
$(UV_RUN_PREFIX) pyodide build-recipes --recipe-dir=recipes --install --force-rebuild "$${RECIPE_TARGET}"

@echo "... Passed"

Expand Down
1 change: 1 addition & 0 deletions integration_tests/recipes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This directory contains a few curated recipes to test the build process of pyodi
- zlib: Tests static libraries.
- geos: Tests shared libraries.
- pydoc_data: Unvendored cpython module
- boost-histogram: Tests scikit-build-core and cmake build system.

### For maintainers

Expand Down
19 changes: 19 additions & 0 deletions integration_tests/recipes/boost-histogram/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package:
name: boost-histogram
version: 1.5.0
top-level:
- boost_histogram
source:
url: https://files.pythonhosted.org/packages/source/b/boost_histogram/boost_histogram-1.5.0.tar.gz
sha256: 0623f010e6c52e5d018767723959686090db07fc30f0d1d8475b5d663c5ddb2c
requirements:
run:
- numpy # runtime only
about:
home: https://github.com/scikit-hep/boost-histogram
PyPI: https://pypi.org/project/boost-histogram
summary: The Boost::Histogram Python wrapper.
license: BSD-3-Clause
extra:
recipe-maintainers:
- henryiii
5 changes: 1 addition & 4 deletions pyodide_build/pypabuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
)

AVOIDED_REQUIREMENTS = [
# We don't want to install cmake Python package inside the isolated env as it will shadow
# the pywasmcross cmake wrapper.
# TODO: Find a way to make scikit-build use the pywasmcross cmake wrapper.
"cmake",
# mesonpy installs patchelf in linux platform but we don't want it.
"patchelf",
]
Expand All @@ -52,6 +48,7 @@
"ranlib": "RANLIB",
"strip": "STRIP",
"gfortran": "FC", # https://mesonbuild.com/Reference-tables.html#compiler-and-linker-selection-variables
"cmake": "CMAKE_EXECUTABLE", # For scikit-build to find cmake (https://github.com/scikit-build/scikit-build-core/pull/603)
}


Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ dependencies = [
"pyodide-lock==0.1.0a7",
"auditwheel-emscripten~=0.0.9",
"pydantic>=2,<3",
"cmake>=3.24",
"wheel",
"ruamel.yaml",
"packaging",
Expand Down