Update python-modules.py

.github/workflows/build-python-packages.yml

@@ -39,9 +39,9 @@ jobs:
       - name: Generate execution matrix
         id: generate-matrix
         run: |
-          [String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,ubuntu-24.04_arm64,macos-13,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64' }}".Split(",").Trim()
+          [String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,macos-13,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64' }}".Split(",").Trim()
           $matrix = @()
-          
+
           foreach ($configuration in $configurations) {
             $parts = $configuration.Split("_")
             $os = $parts[0]
@@ -52,13 +52,11 @@ jobs:
               "*windows*" { $platform = 'win32' }
             }
             
-            if ($configuration -eq "ubuntu-22.04_arm64") {
+             if ($configuration -eq "ubuntu-22.04_arm64") {
               $os = "setup-actions-ubuntu-arm64-2-core"
-            }
+            }elseif($configuration -eq "ubuntu-24.04_arm64"){
-            elseif ($configuration -eq "ubuntu-24.04_arm64") {
               $os = "setup-actions-ubuntu24-arm64-2-core"
-            }
+            }elseif ($configuration -eq "windows-2019_arm64") {
-            elseif ($configuration -eq "windows-2019_arm64") {
               $os = "setup-actions-windows-arm64-4-core"
             }
             
@@ -69,7 +67,7 @@ jobs:
             }
           }
           echo "matrix=$($matrix | ConvertTo-Json -Compress -AsArray)" >> $env:GITHUB_OUTPUT
-          
+
   build_python:
     needs: generate_matrix
     strategy:
@@ -102,7 +100,7 @@ jobs:
              # Install 7-Zip
             choco install 7zip -y
             echo "C:\ProgramData\chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-            
+
 
       - name: Check out repository code
         uses: actions/checkout@v4
@@ -113,7 +111,7 @@ jobs:
         run: |
           ./builders/build-python.ps1 -Version $env:VERSION `
                   -Platform ${{ matrix.platform }} -Architecture ${{ matrix.arch }}
-                  
+
       - name: Publish artifact
         uses: actions/upload-artifact@v4
         with:
@@ -214,7 +212,7 @@ jobs:
 
       - name: Run tests
         run: |
-            Install-Module Pester -Force -Scope CurrentUser -SkipPublisherCheck
+            Install-Module Pester -Force -Scope CurrentUser
             Import-Module Pester
             $pesterContainer = New-PesterContainer -Path './python-tests.ps1' -Data @{
                 Version="${{ env.VERSION }}";

.github/workflows/codeql-analysis.yml

@@ -13,5 +13,4 @@ jobs:
     name: CodeQL analysis 
     uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main
     with:
-     languages: '["python"]'
+     languages: "['python']"
-   

.github/workflows/releases-validation.yml

@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04, macos-13]
+        os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
-        python: [3.9.13, 3.10.11, 3.11.8, 3.12.7, 3.13.0]
+        python: [3.9.13, 3.10.11, 3.11.8]
     steps:
     - name: setup-python ${{ matrix.python }}
       uses: actions/setup-python@v5

.github/workflows/test-tk.yml

@@ -1,44 +0,0 @@
-name: Test Python Tk
-on:
-  push:
-    branches:
-      - tcl-tk
-  workflow_dispatch:
-
-jobs:
-  tests-poetry:
-    strategy:
-      matrix:
-        os: [macos-13]
-        # python-version: ["3.8.10", "3.8.17", "3.9.1", "3.9.19", "3.9.19", "3.10.1", "3.10.14", "3.11.9"]
-        python-version: [ "3.10.16"]
-
-      fail-fast: false
-    name: ${{ matrix.python-version }} - ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        # uses: actions/setup-python@v5
-        # uses: priya-kinthali/setup-python@test-930
-        uses: priya-kinthali/setup-python@test-tcl
-        with:
-          python-version: ${{ matrix.python-version }}
-      # - name: Print Tcl/Tk version
-      #   run: |
-      #     tclsh <<< 'puts [info patchlevel]; exit'
-      #     wish <<< 'puts [info patchlevel]; exit'
-      - name: Verify Python Tk Version
-        run: |
-          python -c "import tkinter; print(f'Tkinter TkVersion: {tkinter.TkVersion}')"
-      - name: Prepare Ubuntu xvfb
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libxkbcommon-x11-0 xvfb
-      - name: Run tk script (closes itself after 5 seconds) - Ubuntu
-        if: runner.os == 'Linux'
-        run: xvfb-run python tk_min.py
-      - name: Run tk script (closes itself after 5 seconds)
-        if: runner.os != 'Linux'
-        run: python tk_min.py

builders/macos-python-builder.psm1

@@ -68,10 +68,10 @@ class macOSPythonBuilder : NixPythonBuilder {
         ### and then add the appropriate paths for the header and library files to configure command.
         ### Link to documentation (https://cpython-devguide.readthedocs.io/setup/#build-dependencies)
         if ($this.Version -lt "3.7.0") {
-            $env:LDFLAGS = "-L/usr/local/opt/openssl@3/lib -L/usr/local/opt/zlib/lib"
+            $env:LDFLAGS = "-L/usr/local/opt/openssl@1.1/lib -L/usr/local/opt/zlib/lib"
-            $env:CFLAGS = "-I/usr/local/opt/openssl@3/include -I/usr/local/opt/zlib/include"
+            $env:CFLAGS = "-I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/zlib/include"
         } else {
-            $configureString += " --with-openssl=/usr/local/opt/openssl@3"
+            $configureString += " --with-openssl=/usr/local/opt/openssl@1.1"
 
             # For Python 3.7.2 and 3.7.3 we need to provide PATH for zlib to pack it properly. Otherwise the build will fail
             # with the error: zipimport.ZipImportError: can't decompress data; zlib not available
@@ -80,8 +80,8 @@ class macOSPythonBuilder : NixPythonBuilder {
                 $env:CFLAGS = "-I/usr/local/opt/zlib/include"
             }
 
-            if ($this.Version -lt "3.11.0") {
+            if ($this.Version -gt "3.7.12") {
-                $configureString += " --with-tcltk-includes='-I /usr/local/opt/tcl-tk/include/tcl-tk' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'"
+                $configureString += " --with-tcltk-includes='-I /usr/local/opt/tcl-tk/include' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'"
 	        }
 
             if ($this.Version -eq "3.7.17") {

tests/python-tests.ps1

@@ -27,7 +27,7 @@ BeforeAll {
             $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 ) ) {
+            if ( ($module -eq "_tkinter") -and ( [semver]"$($Version.Major).$($Version.Minor)" -ge [semver]"3.8" ) ) {
                 Write-Host "$module $Version ignored"
             } else {
                 return 1

tests/sources/python-config-test.py

@@ -54,15 +54,15 @@ else:
 if os_type == 'Darwin':
     ### Validate openssl links
     if version_major == 3 and version_minor < 7:
-        expected_ldflags = '-L/usr/local/opt/openssl@3/lib'
+        expected_ldflags = '-L/usr/local/opt/openssl@1.1/lib'
         ldflags = sysconfig.get_config_var('LDFLAGS')
 
         if not expected_ldflags in ldflags:
             print('Invalid ldflags: %s; Expected: %s' % (ldflags, expected_ldflags))
             exit(1)
     else:
-        expected_openssl_includes = '-I/usr/local/opt/openssl@3/include'
+        expected_openssl_includes = '-I/usr/local/opt/openssl@1.1/include'
-        expected_openssl_ldflags ='-L/usr/local/opt/openssl@3/lib'
+        expected_openssl_ldflags ='-L/usr/local/opt/openssl@1.1/lib'
 
         openssl_includes = sysconfig.get_config_var('OPENSSL_INCLUDES')
         openssl_ldflags = sysconfig.get_config_var('OPENSSL_LDFLAGS')

tk_min.py

@@ -1,7 +0,0 @@
-import tkinter as tk
-
-root = tk.Tk()
-label = tk.Label(root, text="Hello World!")
-label.pack(padx=20, pady=20)
-root.after(5000, root.destroy)    # Close the Window after 5 seconds
-root.mainloop()