Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update pyodide parts a bit #2538

Merged
merged 4 commits into from
Jun 23, 2023
Merged

chore: update pyodide parts a bit #2538

merged 4 commits into from
Jun 23, 2023

Conversation

henryiii
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Jun 22, 2023

Codecov Report

Merging #2538 (cbcd89e) into main (efa1168) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

@henryiii
Copy link
Member Author

Hitting:

Run python3 -m pip install -r docs/requirements-wasm.txt
[13](https://github.com/scikit-hep/awkward/actions/runs/5349678787/jobs/9701234421#step:5:14)
ERROR: Could not open requirements file: [Errno 2] No such file or directory: 'docs/requirements-wasm.txt'

Which appears on main, too.

set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
set(CMAKE_INSTALL_RPATH "@loader_path")
elseif(EMSCRIPTEN)
if(CMAKE_SYSTEM_NAME STREQUAL Emscripten)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! This is much better.

@@ -105,6 +102,7 @@ target_link_libraries(awkward PRIVATE awkward-cpu-kernels-static ${CMAKE_DL_LIBS
target_link_libraries(awkward PUBLIC awkward-parent)

# Third tier: Python modules.
find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't pybind11 handle this for us? We don't link against these targets in this module.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It defaults to the old FindPythonLibs/FindPythonInterp. You can use a variable to force the new search, or just search for it first.

If you build outside of scikit-build-core and want PyPy support, it's better to use the variable.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(this is going to matter in CMake 3.27 which removes FindPythonLibs/FindPythonInterp if you set 3.27 as your max or min version)

@agoose77 agoose77 temporarily deployed to docs-preview June 22, 2023 20:53 — with GitHub Actions Inactive
@agoose77 agoose77 merged commit 7b22fd1 into main Jun 23, 2023
36 checks passed
@agoose77 agoose77 deleted the henryiii/chore/pyodide branch June 23, 2023 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants