From ef0900a88daa324594f23aed300f3b836b3657f1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Dec 2025 15:42:55 -0800 Subject: [PATCH] ... --- ebook2audiobook.cmd | 2 +- ebook2audiobook.sh | 2 +- lib/classes/device_installer.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ebook2audiobook.cmd b/ebook2audiobook.cmd index 54b0e3ee..a2bdbb60 100755 --- a/ebook2audiobook.cmd +++ b/ebook2audiobook.cmd @@ -432,7 +432,7 @@ exit /b 0 echo [ebook2audiobook] Installing dependencies... python -m pip cache purge >nul 2>&1 python -m pip install --upgrade pip >nul 2>&1 -python -m pip install --upgrade --no-cache-dir --use-pep517 --progress-bar on -r "%SCRIPT_DIR%\requirements.txt" +python -m pip install --upgrade --no-cache-dir --use-pep517 --progress-bar on --disable-pip-version-check -r "%SCRIPT_DIR%\requirements.txt" if errorlevel 1 goto :failed for /f "tokens=2 delims=: " %%A in ('pip show torch 2^>nul ^| findstr /b /c:"Version"') do ( set "torch_ver=%%A" diff --git a/ebook2audiobook.sh b/ebook2audiobook.sh index 6cf10c72..045ce253 100755 --- a/ebook2audiobook.sh +++ b/ebook2audiobook.sh @@ -620,7 +620,7 @@ function install_python_packages { echo "[ebook2audiobook] Installing dependencies..." python3 -m pip cache purge > /dev/null 2>&1 python3 -m pip install --upgrade pip > /dev/null 2>&1 - python3 -m pip install --upgrade --no-cache-dir --use-pep517 --progress-bar on -r "$SCRIPT_DIR/requirements.txt" || exit 1 + python3 -m pip install --upgrade --no-cache-dir --use-pep517 --progress-bar on --disable-pip-version-check -r "$SCRIPT_DIR/requirements.txt" || exit 1 python3 -m unidic download || exit 1 echo "[ebook2audiobook] Installation completed." return 0 diff --git a/lib/classes/device_installer.py b/lib/classes/device_installer.py index b8051f3b..a95bdf59 100644 --- a/lib/classes/device_installer.py +++ b/lib/classes/device_installer.py @@ -677,7 +677,7 @@ class DeviceInstaller(): with tqdm(total = len(packages), desc = 'Installation 0.00%', bar_format = '{desc}: {n_fmt}/{total_fmt} ', unit = 'step') as t: for package in tqdm(missing_packages, desc = 'Installing', unit = 'pkg'): try: - subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', package]) + subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', package]) t.update(1) except subprocess.CalledProcessError as e: error = f'Failed to install {package}: {e}' @@ -733,22 +733,22 @@ class DeviceInstaller(): tag_py = f'cp{py_major}{py_minor}-cp{py_major}{py_minor}' torch_pkg = f"{url}/v{toolkit_version}/torch-{jetson_torch_version_base[tag]}%2B{tag}-{tag_py}-{os_env}_{arch}.whl" torchaudio_pkg = f"{url}/v{toolkit_version}/torchaudio-{jetson_torch_version_base[tag]}%2B{tag}-{tag_py}-{os_env}_{arch}.whl" - subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', torch_pkg, torchaudio_pkg]) + subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', torch_pkg, torchaudio_pkg]) subprocess.check_call([sys.executable, '-m', 'pip', 'uninstall', '-y', 'scikit-learn']) - subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', 'scikit-learn']) + subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', 'scikit-learn']) elif device_info['name'] == devices['MPS']['proc']: torch_tag_py = f'cp{default_py_major}{default_py_minor}-none' torchaudio_tag_py = f'cp{default_py_major}{default_py_minor}-cp{default_py_major}{default_py_minor}' torch_pkg = f'{url}/cpu/torch-{torch_version_base}-{torch_tag_py}-{os_env}_{arch}.whl' torchaudio_pkg = f'{url}/cpu/torchaudio-{torch_version_base}-{torchaudio_tag_py}-{os_env}_{arch}.whl' - subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', torch_pkg, torchaudio_pkg]) + subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', torch_pkg, torchaudio_pkg]) else: tag_py = f'cp{default_py_major}{default_py_minor}-cp{default_py_major}{default_py_minor}' torch_pkg = f'{url}/{tag}/torch-{torch_version_base}%2B{tag}-{tag_py}-{os_env}_{arch}.whl' torchaudio_pkg = f'{url}/{tag}/torchaudio-{torch_version_base}%2B{tag}-{tag_py}-{os_env}_{arch}.whl' - subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', torch_pkg, torchaudio_pkg]) + subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', torch_pkg, torchaudio_pkg]) if device_info['name'] == 'cuda': - subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', 'deepspeed']) + subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', '--no-cache-dir', '--use-pep517', '--progress-bar', 'on', '--disable-pip-version-check', 'deepspeed']) #msg = 'Relaunching app...' #print(msg) #os.execv(sys.executable, [sys.executable] + sys.argv)