From bd6b15f00746dea7dc38bd90e6022f8f0e820788 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Thu, 14 Aug 2025 20:52:13 +0000 Subject: [PATCH 1/7] ensure we have on this guy --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index a1fd500691ca..784a52755057 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -173,7 +173,7 @@ function Get-AllPackageInfoFromRepo ($serviceDirectory) } Write-Host "Running get_package_properties.py to retrieve package properties" - $allPkgPropLines = python (Join-path eng scripts get_package_properties.py) -s $searchPath + $allPkgPropLines = python (Join-path $RepoRoot eng scripts get_package_properties.py) -s $searchPath } catch { From 4855cc6bd4f479d225d6a4597f084c2162dfdff0 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Thu, 14 Aug 2025 22:49:13 +0000 Subject: [PATCH 2/7] ensure that we can install using absolute path if necessary --- eng/scripts/Language-Settings.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 784a52755057..955b7d8ee2c4 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -161,15 +161,16 @@ function Get-AllPackageInfoFromRepo ($serviceDirectory) $allPkgPropLines = $null try { + $pathToBuild = (Join-Path $RepoRoot "tools" "azure-sdk-tools[build]") # Use ‘uv pip install’ if uv is on PATH, otherwise fall back to python -m pip if (Get-Command uv -ErrorAction SilentlyContinue) { Write-Host "Using uv pip install" - $null = uv pip install "./tools/azure-sdk-tools[build]" + $null = uv pip install "$pathToBuild" $freezeOutput = uv pip freeze Write-Host "Pip freeze output: $freezeOutput" } else { Write-Host "Using python -m pip install" - $null = python -m pip install "./tools/azure-sdk-tools[build]" -q -I + $null = python -m pip install "$pathToBuild" -q -I } Write-Host "Running get_package_properties.py to retrieve package properties" From 86ced5e07cf0596a23529de319e365969b7007a1 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 15 Aug 2025 15:21:18 +0000 Subject: [PATCH 3/7] a couple additional --- eng/scripts/Language-Settings.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 955b7d8ee2c4..f9d96f162003 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -173,8 +173,9 @@ function Get-AllPackageInfoFromRepo ($serviceDirectory) $null = python -m pip install "$pathToBuild" -q -I } - Write-Host "Running get_package_properties.py to retrieve package properties" - $allPkgPropLines = python (Join-path $RepoRoot eng scripts get_package_properties.py) -s $searchPath + $scriptLoc = Join-path $RepoRoot eng scripts get_package_properties.py + Write-Host "Running '$scriptLoc' to retrieve package properties" + $allPkgPropLines = python $scriptLoc -s $searchPath } catch { @@ -189,6 +190,7 @@ function Get-AllPackageInfoFromRepo ($serviceDirectory) foreach ($line in $allPkgPropLines) { + Write-Host "Parsing: '$line'" $pkgInfo = ($line -Split " ") $packageName = $pkgInfo[0] $packageVersion = $pkgInfo[1] From d6ca65d56716af3dd6dd85c644b231a19af3f898 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 15 Aug 2025 17:15:43 +0000 Subject: [PATCH 4/7] ensure this is fixed everywhere --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index f9d96f162003..b6c07f49bbfc 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -175,7 +175,7 @@ function Get-AllPackageInfoFromRepo ($serviceDirectory) $scriptLoc = Join-path $RepoRoot eng scripts get_package_properties.py Write-Host "Running '$scriptLoc' to retrieve package properties" - $allPkgPropLines = python $scriptLoc -s $searchPath + $allPkgPropLines = python $scriptLoc -s (Join-Path $RepoRoot $searchPath) } catch { From c1f4a5fe84109b97db98da3b2f53f3f2fb6680d5 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 15 Aug 2025 17:17:56 +0000 Subject: [PATCH 5/7] also add a fix for the regression break --- eng/pipelines/templates/jobs/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/regression.yml b/eng/pipelines/templates/jobs/regression.yml index 4fa0629ed1be..9f71e39c632c 100644 --- a/eng/pipelines/templates/jobs/regression.yml +++ b/eng/pipelines/templates/jobs/regression.yml @@ -86,7 +86,7 @@ jobs: - pwsh: | mkdir -p $(TEST_PROXY_FOLDER) - python -m pip install -r eng/regression_tools.txt + $(PIP_EXE) install -r eng/regression_tools.txt displayName: 'Prep Environment' - template: /eng/common/testproxy/test-proxy-tool.yml From 30c3071ac9054e64268643bf0ebb4332df2a6477 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 15 Aug 2025 17:21:01 +0000 Subject: [PATCH 6/7] cleanup build --- eng/scripts/Language-Settings.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index b6c07f49bbfc..757a6cbd410e 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -190,7 +190,6 @@ function Get-AllPackageInfoFromRepo ($serviceDirectory) foreach ($line in $allPkgPropLines) { - Write-Host "Parsing: '$line'" $pkgInfo = ($line -Split " ") $packageName = $pkgInfo[0] $packageVersion = $pkgInfo[1] From 830e2dccce30a74b8418a20ddbdb38337e9f92a9 Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Fri, 15 Aug 2025 10:25:29 -0700 Subject: [PATCH 7/7] Update eng/scripts/Language-Settings.ps1 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- eng/scripts/Language-Settings.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1 index 757a6cbd410e..e1002f997a5f 100644 --- a/eng/scripts/Language-Settings.ps1 +++ b/eng/scripts/Language-Settings.ps1 @@ -175,7 +175,7 @@ function Get-AllPackageInfoFromRepo ($serviceDirectory) $scriptLoc = Join-path $RepoRoot eng scripts get_package_properties.py Write-Host "Running '$scriptLoc' to retrieve package properties" - $allPkgPropLines = python $scriptLoc -s (Join-Path $RepoRoot $searchPath) + $allPkgPropLines = python "$scriptLoc" -s "$(Join-Path $RepoRoot $searchPath)" } catch {