From 84e1980573d5db40bc36abb0e4c2bf4373a29e7d Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 14 Aug 2024 15:42:22 +0900 Subject: [PATCH 1/3] nanobind== 2.1.0 --- pyproject.toml | 2 +- requirements-dev.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 477f35f0..3a3666b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ build-backend = "setuptools.build_meta" [tool.rye] dev-dependencies = [ - "nanobind~=2.0.0", + "nanobind~=2.1.0", "setuptools>=69.2", "build~=1.2.1", "wheel~=0.43.0", diff --git a/requirements-dev.lock b/requirements-dev.lock index 14c56ece..4d81679c 100644 --- a/requirements-dev.lock +++ b/requirements-dev.lock @@ -16,7 +16,7 @@ exceptiongroup==1.2.2 # via pytest iniconfig==2.0.0 # via pytest -nanobind==2.0.0 +nanobind==2.1.0 packaging==24.1 # via auditwheel # via build @@ -29,7 +29,7 @@ pyproject-hooks==1.1.0 # via build pytest==8.3.2 ruff==0.5.7 -setuptools==72.1.0 +setuptools==72.2.0 tomli==2.0.1 # via build # via pytest From dc7751c26e0a9075b448afab9ac20ff8fa3be9b9 Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 14 Aug 2024 15:43:40 +0900 Subject: [PATCH 2/3] =?UTF-8?q?nanobind=202.1.0=20=E3=81=AB=E4=B8=8A?= =?UTF-8?q?=E3=81=92=E3=81=9F=E3=81=93=E3=81=A8=E3=81=A7=E3=83=91=E3=83=83?= =?UTF-8?q?=E3=83=81=E3=81=8C=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fix_nanobind_nb_func.patch | 35 ----------------------------------- run.py | 12 ------------ 2 files changed, 47 deletions(-) delete mode 100644 fix_nanobind_nb_func.patch diff --git a/fix_nanobind_nb_func.patch b/fix_nanobind_nb_func.patch deleted file mode 100644 index 9e917078..00000000 --- a/fix_nanobind_nb_func.patch +++ /dev/null @@ -1,35 +0,0 @@ -# https://github.com/wjakob/nanobind/issues/613 の問題を修正するパッチ -# 以下のように利用する -# -# ``` -# cp include/nanobind/nb_func.h include/nanobind/nb_func.h.old -# patch < fix_nanobind_nf_func.patch -# ``` -# ---- include/nanobind/nb_func.h.old 2024-07-19 07:55:35.166432900 +0900 -+++ include/nanobind/nb_func.h 2024-07-19 07:50:33.812445300 +0900 -@@ -199,14 +199,24 @@ - - PyObject *result; - if constexpr (std::is_void_v) { -+#if defined(_WIN32) -+ cap->func(static_cast>(in.template get())...); -+#else - cap->func(in.template get().operator cast_t()...); -+#endif - result = Py_None; - Py_INCREF(result); - } else { -+#if defined(_WIN32) -+ result = cast_out::from_cpp( -+ cap->func(static_cast>(in.template get())...), -+ policy, cleanup).ptr(); -+#else - result = cast_out::from_cpp( - cap->func((in.template get()) - .operator cast_t()...), - policy, cleanup).ptr(); -+#endif - } - - if constexpr (Info::keep_alive) diff --git a/run.py b/run.py index 17d4f814..83f80716 100644 --- a/run.py +++ b/run.py @@ -10,7 +10,6 @@ from buildbase import ( Platform, add_path, - apply_patch, build_sora, build_webrtc, cd, @@ -157,17 +156,6 @@ def install_deps( } install_openh264(**install_openh264_args) - # nanobind にパッチを適用する - nanobind_include_dir = cmdcap([sys.executable, "-m", "nanobind", "--include_dir"]) - if not os.path.exists(os.path.join(nanobind_include_dir, "nanobind", "nb_func.h.old")): - shutil.copyfile( - os.path.join(nanobind_include_dir, "nanobind", "nb_func.h"), - os.path.join(nanobind_include_dir, "nanobind", "nb_func.h.old"), - ) - patch = os.path.join(BASE_DIR, "fix_nanobind_nb_func.patch") - with cd(nanobind_include_dir): - apply_patch(patch, nanobind_include_dir, 1) - AVAILABLE_TARGETS = [ "windows_x86_64", From e6a059949280e76aee68efc7096390d07f760671 Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 14 Aug 2024 15:45:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?examples-e2e-test=20=E3=81=AF=20examples=20?= =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E3=81=8C=E6=9B=B4=E6=96=B0=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AE=E3=81=BF=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/examples-e2e-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/examples-e2e-test.yml b/.github/workflows/examples-e2e-test.yml index da58b13e..005a7dc9 100644 --- a/.github/workflows/examples-e2e-test.yml +++ b/.github/workflows/examples-e2e-test.yml @@ -3,9 +3,9 @@ name: examples-e2e-test on: workflow_dispatch: push: - # paths: - # - .github/workflows/examples-e2e-test.yml - # - examples + paths: + - .github/workflows/examples-e2e-test.yml + - examples jobs: e2e_ubuntu_test: