Skip to content

Bump toml11 to 4.4.0, nlohmann_json to 3.12.0 #1842

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.

Sign up for GitHub

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

Open
franzpoeschel wants to merge 5 commits into
base: dev
Choose a base branch
from
+9 −7
Open

Bump toml11 to 4.4.0, nlohmann_json to 3.12.0 #1842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
088c8c9
Bump versions for toml11 nlohmann_json pybind11
franzpoeschel Jan 19, 2026
bc1817d
tmp: try sth
franzpoeschel Jan 19, 2026
a63d52a
Revert "tmp: try sth"
franzpoeschel Jan 19, 2026
db94df3
Return py::object instead of std::variant to pybind11
franzpoeschel Jan 19, 2026
38bb163
Revert Pybind to old version again
franzpoeschel Jan 19, 2026
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
6 changes: 3 additions & 3 deletions cmake/dependencies/json.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ set(openPMD_json_src ""
"Local path to nlohmann_json source directory (preferred if set)")

# tarball fetcher
set(openPMD_json_tar "https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz"
set(openPMD_json_tar "https://github.com/nlohmann/json/archive/refs/tags/v3.12.0.tar.gz"
CACHE STRING
"Remote tarball link to pull and build nlohmann_json from if(openPMD_USE_INTERNAL_JSON)")
set(openPMD_json_tar_hash "SHA256=0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406"
set(openPMD_json_tar_hash "SHA256=4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187"
CACHE STRING
"Hash checksum of the tarball of nlohmann_json if(openPMD_USE_INTERNAL_JSON)")

# Git fetcher
set(openPMD_json_repo "https://github.com/nlohmann/json.git"
CACHE STRING
"Repository URI to pull and build nlohmann_json from if(openPMD_USE_INTERNAL_JSON)")
set(openPMD_json_branch "v3.11.3"
set(openPMD_json_branch "v3.12.0"
CACHE STRING
"Repository branch for openPMD_json_repo if(openPMD_USE_INTERNAL_JSON)")

Expand Down
6 changes: 3 additions & 3 deletions cmake/dependencies/toml11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@ set(openPMD_toml11_src ""
"Local path to toml11 source directory (preferred if set)")

# tarball fetcher
set(openPMD_toml11_tar "https://github.com/ToruNiina/toml11/archive/refs/tags/v4.2.0.tar.gz"
set(openPMD_toml11_tar "https://github.com/ToruNiina/toml11/archive/refs/tags/v4.4.0.tar.gz"
CACHE STRING
"Remote tarball link to pull and build toml11 from if(openPMD_USE_INTERNAL_TOML11)")
set(openPMD_toml11_tar_hash "SHA256=9287971cd4a1a3992ef37e7b95a3972d1ae56410e7f8e3f300727ab1d6c79c2c"
set(openPMD_toml11_tar_hash "SHA256=815bfe6792aa11a13a133b86e7f0f45edc5d71eb78f5fb6686c49c7f792b9049"
CACHE STRING
"Hash checksum of the tarball of toml11 if(openPMD_USE_INTERNAL_TOML11)")

# Git fetcher
set(openPMD_toml11_repo "https://github.com/ToruNiina/toml11.git"
CACHE STRING
"Repository URI to pull and build toml11 from if(openPMD_USE_INTERNAL_TOML11)")
set(openPMD_toml11_branch "v3.7.1"
set(openPMD_toml11_branch "v4.4.0"
CACHE STRING
"Repository branch for openPMD_toml11_repo if(openPMD_USE_INTERNAL_TOML11)")

Expand Down
4 changes: 3 additions & 1 deletion src/binding/python/Attributable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,9 @@ void init_Attributable(py::module &m)
"get_attribute",
[](Attributable &attr, std::string const &key) {
auto v = attr.getAttribute(key);
return v.getVariant<attribute_types>();
return std::visit(
[](auto const &val) { return py::cast(val); },
v.getVariant<attribute_types>());
// TODO instead of returning lists, return all arrays (ndim > 0)
// as numpy arrays?
})
Expand Down
Loading