Merge branch 'release/2023.1.2'

.gitignore

@@ -11,6 +11,7 @@ build
 
 src/sora_sdk/*.so
 src/sora_sdk/*.dll
+src/sora_sdk/*.pyd
 src/sora_sdk/model_coeffs/*
 !src/sora_sdk/model_coeffs/.gitkeep
 

CHANGES.md

@@ -11,6 +11,11 @@
 
 ## develop
 
+## 2023.1.2
+
+- [FIX] Windows の Python 用ライブラリが dll ではなく pyd だったのを修正する
+ - @melpon
+
 ## 2023.1.1
 
 **2023-06-27**

README.md

@@ -55,6 +55,7 @@ $ pip install sora_sdk
 
 ```
 $ rye add sora_sdk
+$ rye sync
 ```
 
 ## システム条件
@@ -82,6 +83,9 @@ $ rye add sora_sdk
 
 **詳細は Discord やメールなどでお気軽にお問い合わせください**
 
+- DataChannel 対応
+ - [アダワープジャパン株式会社](https://adawarp.com/) 様
+
 ## サポートについて
 
 ### Discord

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sora_sdk"
 authors = [{ name = "Shiguredo Inc.", email = "contact+pypi@shiguredo.jp" }]
-version = "2023.1.1"
+version = "2023.1.2"
 description = "WebRTC SFU Sora Python SDK"
 readme = "README.md"
 license = { file = "LICENSE" }

requirements-dev.lock

@@ -9,6 +9,7 @@
 -e file:.
 auditwheel==5.4.0
 build==0.10.0
+colorama==0.4.6
 exceptiongroup==1.1.1
 iniconfig==2.0.0
 nanobind==1.4.0

run.py

@@ -717,25 +717,32 @@ def main():
  "-DNB_SUFFIX=.cpython-38-aarch64-linux-gnu.so",
  ]
 
- mkdir_p(os.path.join(build_dir, 'sora_sdk'))
- with cd(os.path.join(build_dir, 'sora_sdk')):
+ sora_src_dir = os.path.join('src', 'sora_sdk')
+ sora_build_dir = os.path.join(build_dir, 'sora_sdk')
+ if target_platform.os == 'windows':
+ sora_build_target_dir = os.path.join(build_dir, 'sora_sdk', configuration)
+ else:
+ sora_build_target_dir = os.path.join(build_dir, 'sora_sdk')
+
+ mkdir_p(sora_build_dir)
+ with cd(sora_build_dir):
  cmd(['cmake', BASE_DIR, *cmake_args])
  cmd(['cmake', '--build', '.', '--config', configuration])
 
- for file in os.listdir(os.path.join('src', 'sora_sdk')):
+ for file in os.listdir(sora_src_dir):
  if file.startswith('sora_sdk_ext.') and (
- file.endswith('.so') or file.endswith('.dylib') or file.endswith('.dll')):
- os.remove(os.path.join('src', 'sora_sdk', file))
+ file.endswith('.so') or file.endswith('.dylib') or file.endswith('.pyd')):
+ os.remove(os.path.join(sora_src_dir, file))
 
- for file in os.listdir(os.path.join(build_dir, 'sora_sdk')):
+ for file in os.listdir(sora_build_target_dir):
  if file.startswith('sora_sdk_ext.') and (
- file.endswith('.so') or file.endswith('.dylib') or file.endswith('.dll')):
- shutil.copyfile(os.path.join(build_dir, 'sora_sdk', file),
- os.path.join('src', 'sora_sdk', file))
+ file.endswith('.so') or file.endswith('.dylib') or file.endswith('.pyd')):
+ shutil.copyfile(os.path.join(sora_build_target_dir, file),
+ os.path.join(sora_src_dir, file))
 
  for file in os.listdir(os.path.join(install_dir, 'lyra', 'share', 'model_coeffs')):
  shutil.copyfile(os.path.join(install_dir, 'lyra', 'share', 'model_coeffs', file),
- os.path.join('src', 'sora_sdk', 'model_coeffs', file))
+ os.path.join(sora_src_dir, 'model_coeffs', file))
 
 
 if __name__ == '__main__':