From 72a424dc139cb8563a0d098f673bee5da4003dcc Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 28 Jun 2023 12:08:34 +0900 Subject: [PATCH 1/7] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3648fffa..13e29144 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ $ pip install sora_sdk ``` $ rye add sora_sdk +$ rye sync ``` ## システム条件 From 4e2eec0e7206b5b502d801210e53bec90f8704bd Mon Sep 17 00:00:00 2001 From: melpon Date: Wed, 28 Jun 2023 13:49:03 +0900 Subject: [PATCH 2/7] =?UTF-8?q?Windows=20=E3=81=AE=20Python=20=E7=94=A8?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=81=AF=20dll=20?= =?UTF-8?q?=E3=81=98=E3=82=83=E3=81=AA=E3=81=8F=E3=81=A6=20pyd=20=E3=81=A0?= =?UTF-8?q?=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + requirements-dev.lock | 1 + run.py | 26 ++++++++++++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a6609ea9..23a79576 100644 --- a/.gitignore +++ b/.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 diff --git a/requirements-dev.lock b/requirements-dev.lock index c711ac77..c487c899 100644 --- a/requirements-dev.lock +++ b/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 diff --git a/run.py b/run.py index eebe0f03..bbac864f 100644 --- a/run.py +++ b/run.py @@ -717,25 +717,31 @@ 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_build_dir = os.path.join(build_dir, 'sora_sdk') + if target_platform.os == 'windows': + sora_build_dir = os.path.join(sora_build_dir, configuration) + + sora_src_dir = os.path.join('src', '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_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_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__': From e0c1473506e3f5f73e5f7a673bea1f40abec042a Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 28 Jun 2023 14:11:57 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 5caa7079..bcb7eae6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,11 @@ ## develop +## 2023.1.2 + +- [FIX] Windows の Python 用ライブラリが dll ではなく pyd だったのを修正する + - @melpon + ## 2023.1.1 **2023-06-27** From 4885f69d0156fb92f122187279eb7047cd707fc2 Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 28 Jun 2023 14:18:31 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f524279b..f5d74dac 100644 --- a/pyproject.toml +++ b/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.dev0" description = "WebRTC SFU Sora Python SDK" readme = "README.md" license = { file = "LICENSE" } From 8fca00d7b2ffe9996e17f3909014e30ce2a44b5e Mon Sep 17 00:00:00 2001 From: melpon Date: Wed, 28 Jun 2023 14:18:44 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA?= =?UTF-8?q?=E3=81=AF=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/run.py b/run.py index bbac864f..55db491e 100644 --- a/run.py +++ b/run.py @@ -717,11 +717,12 @@ def main(): "-DNB_SUFFIX=.cpython-38-aarch64-linux-gnu.so", ] + 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_dir = os.path.join(sora_build_dir, configuration) - - sora_src_dir = os.path.join('src', 'sora_sdk') + 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): @@ -733,10 +734,10 @@ def main(): 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(sora_build_dir): + 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('.pyd')): - shutil.copyfile(os.path.join(sora_build_dir, file), + 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')): From 537e5a0e9a8968a4bc6736e8b5876e3aba89a422 Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 28 Jun 2023 14:19:47 +0900 Subject: [PATCH 6/7] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 13e29144..02f1684d 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,9 @@ $ rye sync **詳細は Discord やメールなどでお気軽にお問い合わせください** +- DataChannel 対応 + - [アダワープジャパン株式会社](https://adawarp.com/) 様 + ## サポートについて ### Discord From e00d63a991f5f111bba6f794dedada34d231079b Mon Sep 17 00:00:00 2001 From: voluntas Date: Wed, 28 Jun 2023 15:03:20 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f5d74dac..b140b35e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "sora_sdk" authors = [{ name = "Shiguredo Inc.", email = "contact+pypi@shiguredo.jp" }] -version = "2023.1.2.dev0" +version = "2023.1.2" description = "WebRTC SFU Sora Python SDK" readme = "README.md" license = { file = "LICENSE" }