sora-sdk 2025.3.0.dev3__tar.gz → 2025.3.0.dev5__tar.gz

{sora_sdk-2025.3.0.dev3/src/sora_sdk.egg-info → sora_sdk-2025.3.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.3.0.dev3
+Version: 2025.3.0.dev5
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>

sora_sdk-2025.3.0.dev5/VERSION

@@ -0,0 +1 @@
+2025.3.0.dev5

{sora_sdk-2025.3.0.dev3 → sora_sdk-2025.3.0.dev5}/pyproject.toml

@@ -20,14 +20,14 @@ Documentation = "https://sora-python-sdk.shiguredo.jp"
 Discord = "https://discord.gg/shiguredo"
 
 [build-system]
-requires = ["setuptools==80.8", "wheel==0.45.1"]
+requires = ["setuptools==80.9", "wheel==0.45.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.uv]
 python-preference = "only-managed"
 dev-dependencies = [
     "nanobind==2.7.0",
-    "setuptools==80.8",
+    "setuptools==80.9",
     "build==1.2.2.post1",
     "wheel==0.45.1",
     "typing-extensions",
@@ -37,7 +37,7 @@ dev-dependencies = [
     "ruff",
     "pyjwt",
     "pytest-repeat",
-    # "ty",
+    "ty",
     "pydantic-settings",
     "pyright",
 ]

{sora_sdk-2025.3.0.dev3 → sora_sdk-2025.3.0.dev5}/run.py

@@ -31,7 +31,7 @@ from buildbase import (
     mkdir_p,
     read_version_file,
 )
-from pypath import get_python_include_dir, get_python_library, get_python_version
+from pypath import get_python_include_dir, get_python_version
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 
@@ -174,6 +174,7 @@ AVAILABLE_TARGETS = [
     "macos_arm64",
     "ubuntu-22.04_x86_64",
     "ubuntu-24.04_x86_64",
+    "ubuntu-22.04_armv8",
     "ubuntu-24.04_armv8",
     "ubuntu-22.04_armv8_jetson",
 ]
@@ -200,6 +201,8 @@ def main():
         platform = Platform("ubuntu", "22.04", "x86_64")
     elif args.target == "ubuntu-24.04_x86_64":
         platform = Platform("ubuntu", "24.04", "x86_64")
+    elif args.target == "ubuntu-22.04_armv8":
+        platform = Platform("ubuntu", "22.04", "armv8")
     elif args.target == "ubuntu-24.04_armv8":
         platform = Platform("ubuntu", "24.04", "armv8")
     elif args.target == "ubuntu-22.04_armv8_jetson":
@@ -252,13 +255,8 @@ def main():
         cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}")
         cmake_args.append(f"-DOPENH264_DIR={cmake_path(os.path.join(install_dir, 'openh264'))}")
         python_version = get_python_version()
-        cmake_args.append(f"-DPYTHON_VERSION_STRING={python_version}")
-        cmake_args.append(f"-DPYTHON_INCLUDE_DIR={get_python_include_dir(python_version)}")
-        cmake_args.append(f"-DPYTHON_EXECUTABLE={cmake_path(sys.executable)}")
-        python_library = get_python_library(python_version)
-        if python_library is None:
-            raise Exception("Failed to get Python library")
-        cmake_args.append(f"-DPYTHON_LIBRARY={cmake_path(python_library)}")
+        cmake_args.append(f"-DPython_INCLUDE_DIR={get_python_include_dir(python_version)}")
+        cmake_args.append(f"-DPython_EXECUTABLE={cmake_path(sys.executable)}")
 
         if platform.target.os == "ubuntu":
             # クロスコンパイルの設定。
@@ -282,7 +280,8 @@ def main():
 
             if platform.build.arch != platform.target.arch:
                 sysroot = os.path.join(install_dir, "rootfs")
-                nb_cmake_dir = cmdcap(["uv", "run", "python", "-m", "nanobind", "--cmake_dir"])
+                python_version = get_python_version()
+                python_version_short = ".".join(python_version.split(".")[:2])
                 cmake_args += [
                     "-DCMAKE_SYSTEM_NAME=Linux",
                     "-DCMAKE_SYSTEM_PROCESSOR=aarch64",
@@ -293,10 +292,8 @@ def main():
                     "-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH",
                     "-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH",
                     "-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH",
-                    f"-DPython_ROOT_DIR={cmake_path(os.path.join(sysroot, 'usr', 'include', 'python3.12'))}",
                     f"-DCMAKE_SYSROOT={sysroot}",
-                    f"-DNB_CMAKE_DIR={nb_cmake_dir}",
-                    "-DNB_SUFFIX=.cpython-312-aarch64-linux-gnu.so",
+                    f"-DNB_SUFFIX=.cpython-{python_version_short.replace('.', '')}-aarch64-linux-gnu.so",
                 ]
         elif platform.target.os == "macos":
             sysroot = cmdcap(["xcrun", "--sdk", "macosx", "--show-sdk-path"])

{sora_sdk-2025.3.0.dev3 → sora_sdk-2025.3.0.dev5}/setup.py

@@ -24,12 +24,15 @@ def run_setup(build_platform, target_platform):
     if target_platform.os == "jetson":
         plat = "manylinux_2_17_aarch64.manylinux2014_aarch64"
     elif target_platform.os == "ubuntu" and target_platform.arch == "armv8":
-        plat = "manylinux_2_17_aarch64.manylinux2014_aarch64"
+        if target_platform.osver == "22.04":
+            plat = "manylinux_2_31_aarch64"
+        if target_platform.osver == "24.04":
+            plat = "manylinux_2_35_aarch64"
     elif target_platform.os == "ubuntu" and target_platform.arch == "x86_64":
         if target_platform.osver == "22.04":
-            plat = "manylinux_2_17_x86_64.manylinux2014_x86_64"
+            plat = "manylinux_2_31_x86_64"
         if target_platform.osver == "24.04":
-            plat = "manylinux_2_17_x86_64.manylinux2014_x86_64"
+            plat = "manylinux_2_35_x86_64"
 
     class bdist_wheel(_bdist_wheel):
         def finalize_options(self):
@@ -62,6 +65,8 @@ def main():
     target = os.getenv("SORA_SDK_TARGET")
     if target is None:
         target_platform = build_platform
+    elif target == "ubuntu-22.04_armv8":
+        target_platform = PlatformTarget("ubuntu", "22.04", "armv8")
     elif target == "ubuntu-24.04_armv8":
         target_platform = PlatformTarget("ubuntu", "24.04", "armv8")
     elif target == "ubuntu-22.04_armv8_jetson":

{sora_sdk-2025.3.0.dev3 → sora_sdk-2025.3.0.dev5}/src/sora_sdk/__init__.py

@@ -1,5 +1,24 @@
 from .sora_sdk_ext import *  # noqa: F401,F403
 
+# インストールされたパッケージの場合は importlib.metadata から取得
+# 開発環境の場合は VERSION ファイルから取得
+try:
+    from importlib.metadata import version, PackageNotFoundError
+    try:
+        __version__ = version("sora_sdk")
+    except PackageNotFoundError:
+        # パッケージがインストールされていない場合（開発環境）
+        import os
+        _version_file = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "VERSION")
+        if os.path.exists(_version_file):
+            with open(_version_file, "r") as f:
+                __version__ = f.read().strip()
+        else:
+            __version__ = "unknown"
+except ImportError:
+    # Python 3.8 以前の互換性のため
+    __version__ = "unknown"
+
 """
 sink はそれぞれ track が必要で参照を保持する必要がある
 しかしながら、 sink の C++ 側で shared_ptr として track を持つと、

{sora_sdk-2025.3.0.dev3 → sora_sdk-2025.3.0.dev5/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.3.0.dev3
+Version: 2025.3.0.dev5
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>

{sora_sdk-2025.3.0.dev3 → sora_sdk-2025.3.0.dev5}/src/sora_sdk.egg-info/SOURCES.txt

@@ -39,4 +39,5 @@ tests/test_simulcast.py
 tests/test_sora_disconnect.py
 tests/test_type_disconnect.py
 tests/test_type_switched.py
-tests/test_vad.py
+tests/test_vad.py
+tests/test_version.py

sora_sdk-2025.3.0.dev5/tests/test_version.py

@@ -0,0 +1,17 @@
+import os
+import sora_sdk
+
+
+def test_version():
+    """sora_sdk.__version__ が取得できることを確認"""
+    assert hasattr(sora_sdk, "__version__")
+    assert isinstance(sora_sdk.__version__, str)
+    assert sora_sdk.__version__ != "unknown"
+    
+    # VERSION ファイルの内容と一致することを確認
+    version_file = os.path.join(os.path.dirname(os.path.dirname(__file__)), "VERSION")
+    with open(version_file, "r") as f:
+        expected_version = f.read().strip()
+    
+    assert sora_sdk.__version__ == expected_version
+    print(f"sora_sdk.__version__ = {sora_sdk.__version__}")

sora_sdk-2025.3.0.dev3/VERSION

@@ -1 +0,0 @@
-2025.3.0.dev3