Merge branch 'main' into ubuntu-24.04-build-failure-fix

tests/python-tests.ps1

@@ -13,35 +13,29 @@ Import-Module (Join-Path $PSScriptRoot "../builders/python-version.psm1")
 
 BeforeAll {
     function Analyze-MissingModules([string] $buildOutputLocation) {
-    $searchStringStart = "Failed to build these modules:"
-    $searchStringEnd = "running build_scripts"
-    $pattern = "$searchStringStart(.*?)$searchStringEnd"
+        $searchStringStart = "Failed to build these modules:"
+        $searchStringEnd = "running build_scripts"
+        $pattern = "$searchStringStart(.*?)$searchStringEnd"
 
-    $buildContent = Get-Content -Path $buildOutputLocation
-    $splitBuiltOutput = $buildContent -split "\n"
+        $buildContent = Get-Content -Path $buildOutputLocation
+        $splitBuiltOutput = $buildContent -split "\n";
 
-    ### Search for missing modules that are displayed between the search strings
-    $regexMatch = [regex]::match($splitBuiltOutput, $pattern)
-    if ($regexMatch.Success) {
-        $module = $regexMatch.Groups[1].Value.Trim()
-        Write-Host "Failed missing modules:"
-        Write-Host $module
-        try {
-            $semver = [semver]"$($Version.Major).$($Version.Minor)"
-        } catch {
-            Write-Error "Invalid Semantic Version format: $Version"
-            return 1
+        ### Search for missing modules that are displayed between the search strings
+        $regexMatch = [regex]::match($SplitBuiltOutput, $Pattern)
+        if ($regexMatch.Success)
+        {
+            $module = $regexMatch.Groups[1].Value.Trim()
+            Write-Host "Failed missing modules:"
+            Write-Host $module
+            if ( ($module -eq "_tkinter") -and ( [semver]"$($Version.Major).$($Version.Minor)" -ge [semver]"3.10" -and $Version.PreReleaseLabel ) ) {
+                Write-Host "$module $Version ignored"
+            } else {
+                return 1
+            }
         }
 
-        if (($module -eq "_tkinter") -and ($semver -ge [semver]"3.8")) {
-            Write-Host "$module $Version ignored"
-        } else {
-            return 1
-        }
+        return 0
     }
-
-    return 0
-}
 }
 
 Describe "Tests" {
@@ -60,7 +54,7 @@ Describe "Tests" {
     # linux has no display name and no $DISPLAY environment variable - skip tk test
     # if (-not (($Platform -match "ubuntu") -or ($Platform -match "linux"))) {
     #     It "Check if tcl/tk has the same headed and library versions" {
-    #     "python ./sources/tcltk.py" | Should -ReturnZeroExitCode
+	#     "python ./sources/tcltk.py" | Should -ReturnZeroExitCode
     #     }
     # }