diff --git a/install_python_stack.py b/install_python_stack.py index b9526af71b..7d3ab66b20 100644 --- a/install_python_stack.py +++ b/install_python_stack.py @@ -116,9 +116,7 @@ def pip_install( # Clean up temp file if we created one if actual_req is not None and actual_req != req: actual_req.unlink(missing_ok=True) - if req is not None and actual_req != req: - skipped = WINDOWS_SKIP_PACKAGES - print(_cyan(f" (Skipped on Windows: {', '.join(skipped)})")) + def download_file(url: str, dest: Path) -> None: diff --git a/setup.ps1 b/setup.ps1 index 9be3f2efb0..c82d03615c 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -15,8 +15,8 @@ $ErrorActionPreference = "Stop" $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path $PackageDir = Split-Path -Parent $ScriptDir -# Detect if running from pip install (no frontend/ dir two levels up) -$FrontendDir = Join-Path $ScriptDir "..\..\frontend" +# Detect if running from pip install (no studio/frontend/ dir in repo) +$FrontendDir = Join-Path $ScriptDir "studio\frontend" $IsPipInstall = -not (Test-Path $FrontendDir) # ───────────────────────────────────────────── @@ -388,20 +388,13 @@ Write-Host "" if ($IsPipInstall) { Write-Host "[OK] Running from pip install - frontend already bundled, skipping build" -ForegroundColor Green } else { - $RepoRoot = (Resolve-Path (Join-Path $ScriptDir "..\..")).Path - Write-Host "" Write-Host "Building frontend..." -ForegroundColor Cyan - Push-Location (Join-Path $RepoRoot "frontend") + Push-Location $FrontendDir npm install 2>&1 | Out-Null npm run build 2>&1 | Out-Null Pop-Location - - $PackageBuildDir = Join-Path $PackageDir "studio\frontend\build" - if (Test-Path $PackageBuildDir) { Remove-Item -Recurse -Force $PackageBuildDir } - Copy-Item -Recurse (Join-Path $RepoRoot "frontend\build") $PackageBuildDir - - Write-Host "[OK] Frontend built" -ForegroundColor Green + Write-Host "[OK] Frontend built to studio/frontend/dist" -ForegroundColor Green } # ==========================================================================