Merge branch 'develop' into feature/e2e-test

shiguredo · Aug 14, 2024 · afc1651 · afc1651
2 parents fa91f89 + e6a0599
commit afc1651
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 52 deletions.
diff --git 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:

diff --git a/fix_nanobind_nb_func.patch b/fix_nanobind_nb_func.patch
diff --git 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
@@ -16,7 +16,7 @@ exceptiongroup==1.2.2
  # via pytest
 iniconfig==2.0.0
  # via pytest
-nanobind==2.0.0
+nanobind==2.1.0
 numpy==2.0.1
  # via opencv-python
 opencv-python==4.10.0.84

diff --git 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",