diff --git a/.release b/.release index 56a37ff..109b640 100644 --- a/.release +++ b/.release @@ -1 +1 @@ -v23.0.2 \ No newline at end of file +v23.0.3 \ No newline at end of file diff --git a/README.md b/README.md index 08d1ed9..1094b54 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ The GUI allows you to set the training parameters and generate and run the requi - [No module called tkinter](#no-module-called-tkinter) - [SDXL training](#sdxl-training) - [Change History](#change-history) + - [2024/03/10 (v23.0.3)](#20240310-v2303) - [2024/03/10 (v23.0.2)](#20240310-v2302) - [2024/03/09 (v23.0.1)](#20240309-v2301) - [2024/03/02 (v23.0.0)](#20240302-v2300) @@ -365,6 +366,11 @@ The documentation in this section will be moved to a separate document later. ## Change History +### 2024/03/10 (v23.0.3) + +- Fix bug with setup +- Enforce proper python version before running the GUI to prevent issues with execution of the GUI. + ### 2024/03/10 (v23.0.2) - Improve validation of path provided by users before running training diff --git a/gui.bat b/gui.bat index c47c30d..4f79e7d 100644 --- a/gui.bat +++ b/gui.bat @@ -15,9 +15,6 @@ if errorlevel 1 ( call .\venv\Scripts\activate.bat set PATH=%PATH%;%~dp0venv\Lib\site-packages\torch\lib -echo "Installing packaging python module..." -pip install packaging - :: Validate requirements python.exe .\setup\validate_requirements.py if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/gui.ps1 b/gui.ps1 index 5ab233d..be9796c 100644 --- a/gui.ps1 +++ b/gui.ps1 @@ -28,8 +28,6 @@ if ($env:VIRTUAL_ENV) { & .\venv\Scripts\activate $env:PATH += ";$($MyInvocation.MyCommand.Path)\venv\Lib\site-packages\torch\lib" -Write-Host "Installing python packaging module..." -& pip install packaging # Debug info about system # python.exe .\setup\debug_info.py diff --git a/setup.bat b/setup.bat index 7d1cc70..79ff65c 100644 --- a/setup.bat +++ b/setup.bat @@ -24,6 +24,9 @@ call .\venv\Scripts\deactivate.bat call .\venv\Scripts\activate.bat +echo "Installing packaging python module..." +pip install packaging + REM Check if the batch was started via double-click IF /i "%comspec% /c %~0 " equ "%cmdcmdline:"=%" ( REM echo This script was started by double clicking. diff --git a/setup.ps1 b/setup.ps1 index df5f92e..5459b5f 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -17,10 +17,13 @@ $null = New-Item -ItemType Directory -Force -Path ".\logs\setup" & .\venv\Scripts\deactivate.bat # Calling external python program to check for local modules -& .\venv\Scripts\python.exe .\setup\check_local_modules.py +# & .\venv\Scripts\python.exe .\setup\check_local_modules.py & .\venv\Scripts\activate.bat +Write-Host "Installing python packaging module..." +& pip install packaging + & .\venv\Scripts\python.exe .\setup\setup_windows.py # Deactivate the virtual environment