From f80846b2239f2d9ed1587f0732d4eb9566e03537 Mon Sep 17 00:00:00 2001
From: litagin02 <litagin02@gmail.com>
Date: Sat, 1 Jun 2024 14:08:56 +0900
Subject: [PATCH] Fix infer req and not to use virtualenv

---
 docs/CHANGELOG.md        |  2 +-
 requirements-infer.txt   |  4 ++--
 scripts/Setup-Python.bat | 25 +++++++++----------------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5e68544..23fc958 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -17,7 +17,7 @@
 - 英語の音声合成の速度向上（[gordon0414](https://github.com/gordon0414)さんによる[PR](https://github.com/litagin02/Style-Bert-VITS2/pull/124)です、ありがとうございます！）
 - エディターの各種機能改善（多くが[kamexy](https://github.com/kamexy)様による[エディターリポジトリ](https://github.com/litagin02/Style-Bert-VITS2-Editor)へのプルリク群です、ありがとうございます！）
     - 選択した行の下に新規の行を作成できるように
-    - 日本語変換のエンターで音声合成が走るバグの修正
+    - Mac使用時に日本語変換のエンターで音声合成が走るバグの修正
     - ペースト時に改行を含まない場合は通常のペーストの振る舞いになるように修正
 
 
diff --git a/requirements-infer.txt b/requirements-infer.txt
index e70e757..6dc1dd4 100644
--- a/requirements-infer.txt
+++ b/requirements-infer.txt
@@ -11,7 +11,7 @@ num2words
 # protobuf==4.25
 psutil
 # punctuators
-# pyannote.audio>=3.1.0
+pyannote.audio>=3.1.0
 # pyloudnorm
 pyopenjtalk-dict
 pypinyin
@@ -20,4 +20,4 @@ pyworld-prebuilt
 # tensorboard
 torch
 transformers
-# umap-learn
+umap-learn
diff --git a/scripts/Setup-Python.bat b/scripts/Setup-Python.bat
index a2df0b1..3a770d6 100644
--- a/scripts/Setup-Python.bat
+++ b/scripts/Setup-Python.bat
@@ -78,31 +78,24 @@ if not exist "%PYTHON_DIR%"\ (
 	echo Executing: "%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location
 	"%PYTHON_CMD%" "%PYTHON_DIR%\get-pip.py" --no-warn-script-location
 	if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
-
-	echo --------------------------------------------------
-	echo Installing virtualenv...
-	echo --------------------------------------------------
-	echo Executing: "%PYTHON_CMD%" -m pip install virtualenv --no-warn-script-location
-	"%PYTHON_CMD%" -m pip install virtualenv --no-warn-script-location
-	if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
 )
 
 if not exist %VENV_DIR%\ (
+	echo --------------------------------------------------
+	echo Installing uv...
+	echo --------------------------------------------------
+	echo Executing: "%PYTHON_CMD%" -m pip install uv
+	"%PYTHON_CMD%" -m pip install uv
+	if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
+
 	echo --------------------------------------------------
 	echo Creating virtual environment...
 	echo --------------------------------------------------
-	echo Executing: "%PYTHON_CMD%" -m virtualenv --copies "%VENV_DIR%"
-	"%PYTHON_CMD%" -m virtualenv --copies "%VENV_DIR%"
+	echo Executing: "%PYTHON_CMD%" -m uv venv "%VENV_DIR%"
+	"%PYTHON_CMD%" -m uv venv "%VENV_DIR%"
 	if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
 )
 
-echo --------------------------------------------------
-echo Activating virtual environment...
-echo --------------------------------------------------
-echo Executing: call "%VENV_DIR%\Scripts\activate.bat"
-call "%VENV_DIR%\Scripts\activate.bat"
-if !errorlevel! neq 0 ( pause & exit /b !errorlevel! )
-
 echo --------------------------------------------------
 echo Completed.
 echo --------------------------------------------------