Skip to content

Sync package (0604) #103

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

Merged
merged 3 commits into from
Jun 5, 2025
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
31 changes: 31 additions & 0 deletions packages/RobotRaconteur/char16_fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/RobotRaconteurCore/src/ServiceDefinition.cpp b/RobotRaconteurCore/src/ServiceDefinition.cpp
index ca81358d..1f03f273 100644
--- a/RobotRaconteurCore/src/ServiceDefinition.cpp
+++ b/RobotRaconteurCore/src/ServiceDefinition.cpp
@@ -35,6 +35,8 @@
#include <boost/range/numeric.hpp>
#include <boost/tuple/tuple_comparison.hpp>

+#include <uchar.h>
+
using namespace boost::algorithm;

namespace RobotRaconteur
@@ -2872,7 +2874,7 @@ static std::string ConstantDefinition_UnescapeString_Formatter(const boost::smat
if (boost::starts_with(i, "\\u"))
{
std::stringstream ss;
- std::basic_string<uint16_t> v3;
+ std::basic_string<char16_t> v3;
v3.resize(i.size() / 6);
for (size_t j = 0; j < v3.size(); j++)
{
@@ -2930,7 +2932,7 @@ static std::string ConstantDefinition_EscapeString_Formatter(const boost::smatch
if (i == "\t")
return "\\t";

- std::basic_string<uint16_t> v = boost::locale::conv::utf_to_utf<uint16_t>(i);
+ std::basic_string<char16_t> v = boost::locale::conv::utf_to_utf<char16_t>(i);

std::stringstream v2;
v2 << std::hex << std::setfill('0');
4 changes: 2 additions & 2 deletions packages/RobotRaconteur/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package:
name: RobotRaconteur
version: 1.2.2

_disabled: true
source:
url: https://github.com/robotraconteur/robotraconteur/releases/download/v1.2.2/RobotRaconteur-1.2.2-Source.tar.gz
sha256: 837710102b5ee6ad81a22e14b313b1dd09995c3da3e7846355866553b3c52715
patches:
- boost_include_fix.patch
- char16_fix.patch

requirements:
run:
Expand Down Expand Up @@ -52,7 +52,7 @@ build:
-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
.
emmake make -j ${PYODIDE_JOBS:-3}
emmake make -j 2
emcc ${SIDE_MODULE_LDFLAGS} -fwasm-exceptions out/lib/libRobotRaconteurCore.a \
out/Python3/RobotRaconteur/_RobotRaconteurPython.a \
$WASM_LIBRARY_DIR/lib/libboost_chrono.a \
Expand Down
3 changes: 2 additions & 1 deletion packages/h5py/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ requirements:
run:
- numpy
- pkgconfig
- libhdf5
host:
- numpy
- libhdf5

build:
vendor-sharedlib: true
# vendor-sharedlib: true
script: |
export HDF5_MPI=OFF
export H5PY_SETUP_REQUIRES="0"
Expand Down
6 changes: 3 additions & 3 deletions packages/narwhals/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package:
name: narwhals
version: 1.40.0
version: 1.41.0
top-level:
- narwhals
source:
url: https://files.pythonhosted.org/packages/py3/n/narwhals/narwhals-1.40.0-py3-none-any.whl
sha256: 1e6c731811d01c61147c52433b4d4edfb6511aaf2c859aa01c2e8ca6ff4d27e5
url: https://files.pythonhosted.org/packages/py3/n/narwhals/narwhals-1.41.0-py3-none-any.whl
sha256: d958336b40952e4c4b7aeef259a7074851da0800cf902186a58f2faeff97be02
about:
home: https://github.com/narwhals-dev/narwhals
PyPI: https://pypi.org/project/narwhals
Expand Down
9 changes: 7 additions & 2 deletions packages/netcdf4/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ requirements:
- h5py
- cftime
- certifi
- libhdf5
test:
imports:
- netCDF4
build:
vendor-sharedlib: true
# FIXME(@ryanking13): In Pyodide 0.28, we have namespace collision issue when loading same shared library from multiple places.
# netCDF4 and h5py both depend on libhdf5, and if we vendor libhdf5 in both packages, the symbols will collide,
# and infinite recursion happens when loading the library.
# It is not clear how to fix this issue right now, so we disable vendoring for now.
# vendor-sharedlib: true
script: |
export PATH=${WASM_LIBRARY_DIR}/bin:${PATH}
export HDF5_DIR=${WASM_LIBRARY_DIR}
Expand All @@ -33,4 +38,4 @@ about:
home: https://github.com/Unidata/netcdf4-python
PyPI: https://pypi.org/project/netcdf4
summary: Provides an object-oriented python interface to the netCDF version 4 library
license: MIT
license: MIT
6 changes: 3 additions & 3 deletions packages/protobuf/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package:
name: protobuf
version: 6.30.0
version: 6.31.1
top-level:
- google

source:
url: https://files.pythonhosted.org/packages/53/6a/2629bb3529e5bdfbd6c4608ff5c7d942cd4beae85793f84ba543aab2548a/protobuf-6.30.0.tar.gz
sha256: 852b675d276a7d028f660da075af1841c768618f76b90af771a8e2c29e6f5965
url: https://files.pythonhosted.org/packages/52/f3/b9655a711b32c19720253f6f06326faf90580834e2e83f840472d752bc8b/protobuf-6.31.1.tar.gz
sha256: d8cac4c982f0b957a4dc73a80e2ea24fab08e679c0de9deb835f4a12d69aca9a

about:
home: https://github.com/protocolbuffers/protobuf
Expand Down
6 changes: 3 additions & 3 deletions packages/python-sat/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package:
name: python-sat
version: 1.8.dev16
version: 1.8.dev17
top-level:
- pysat
source:
sha256: df4752cf290a551aff52f07da3bd8c827f51b286f11e29e67832bb4fffc0e32b
url: https://files.pythonhosted.org/packages/f9/35/7ebe9e31e97b3a2b7efaab800bb8a44f1a6179c392f77abf5ce4a0038dd6/python-sat-1.8.dev16.tar.gz
sha256: 26f873f5fa2fe097fe37015856d09d798a363f32ad50042aa831cb696383bf31
url: https://files.pythonhosted.org/packages/e3/dd/b08843d57509c292cd7bd4a367f7dcc0c5b76edcece3fdc3c35426bfba6d/python-sat-1.8.dev17.tar.gz

patches:
- patches/force_malloc.patch
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ asyncio_mode = "strict"

[tool.pyodide.build]
rust_toolchain = "nightly-2025-02-01"
default_cross_build_env_url = "https://github.com/pyodide/pyodide/releases/download/0.28.0a3/xbuildenv-0.28.0a3.tar.bz2"
default_cross_build_env_url = "https://github.com/pyodide/pyodide-build-environment-nightly/releases/download/20250604/xbuildenv.tar.bz2"
Loading