[wip] python 3.13

.github/workflows/build-packages.yml

@@ -107,8 +107,10 @@ jobs:
       - name: Install build dependencies
         run: |
           apt-get update -y
-          # Installing python3.13-venv for Python 3.13 support
-          apt-get install -y python3.13-venv
+          # Installing python3.13-venv and python3.13-dev for Python 3.13 support
+          apt-get install -y python3.13-venv python3.13-dev
+          # Installing build tools for source compilation of dependencies (e.g. pyzmq)
+          apt-get install -y cmake g++ pkg-config libssl-dev
           # Installing devscripts for source package builds (provides debuild)
           apt-get install -y devscripts
           # Installing patchelf for relenv ELF binary patching
@@ -221,6 +223,10 @@ jobs:
       - name: Install rpmsign
         run: |
           dnf install -y rpmsign
+          if [ "${{ inputs.source }}" == "src" ]; then
+            # Installing python3-devel and build tools for source compilation of dependencies
+            dnf install -y python3-devel cmake gcc-c++ pkgconfig openssl-devel
+          fi
 
       - name: Download Onedir Tarball as an Artifact
         if:  inputs.source == 'onedir'

.github/workflows/ci.yml

@@ -469,8 +469,8 @@ jobs:
     with:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -486,8 +486,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -503,8 +503,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -519,10 +519,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -539,7 +539,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -557,7 +557,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
       workflow-slug: ci
       default-timeout: 180

.github/workflows/nightly.yml

@@ -464,8 +464,8 @@ jobs:
     with:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -481,8 +481,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -502,8 +502,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -522,10 +522,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -542,7 +542,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -560,7 +560,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: true
       workflow-slug: nightly
       default-timeout: 360

.github/workflows/scheduled.yml

@@ -512,8 +512,8 @@ jobs:
     with:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -529,8 +529,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -546,8 +546,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -562,10 +562,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -582,7 +582,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -600,7 +600,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: true
       workflow-slug: scheduled
       default-timeout: 360

.github/workflows/staging.yml

@@ -496,8 +496,8 @@ jobs:
     with:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -514,8 +514,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -536,8 +536,8 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      relenv-version: "0.22.7"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -556,10 +556,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.13.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -576,7 +576,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -594,7 +594,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.13.12
       skip-code-coverage: true
       workflow-slug: staging
       default-timeout: 180

cicd/shared-gh-workflows-context.yml

@@ -3,8 +3,8 @@
 
 # Tool versions
 nox_version: "2022.8.7"
-python_version: "3.11.14"
-relenv_version: "0.22.4"
+python_version: "3.13.12"
+relenv_version: "0.22.7"
 release_branches:
   - "3006.x"
   - "3007.x"

noxfile.py

@@ -85,7 +85,7 @@
 else:
     ONEDIR_PYTHON_PATH = ONEDIR_ARTIFACT_PATH / "bin" / "python3"
 # Python versions to run against
-_PYTHON_VERSIONS = ("3", "3.8", "3.9", "3.10", "3.11")
+_PYTHON_VERSIONS = ("3", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13")
 
 # Nox options
 #  Reuse existing virtualenvs

pkg/macos/install_salt.sh

@@ -127,7 +127,7 @@ fi
 # Install Requirements into the Python Environment
 #-------------------------------------------------------------------------------
 _msg "Installing Salt requirements"
-$PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
+CFLAGS="${CFLAGS} -Wno-int-conversion" $PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
 if [ -f "$BUILD_DIR/bin/distro" ]; then
     _success
 else

pkg/windows/install_salt.ps1

@@ -122,14 +122,16 @@ if ( ! $SkipInstall ) {
   #-------------------------------------------------------------------------------
   # Installing dependencies
   #-------------------------------------------------------------------------------
-  Write-Host "Installing dependencies: " -NoNewline
-  Start-Process -FilePath $SCRIPTS_DIR\pip3.exe `
+  Write-Host "Installing dependencies from $SALT_DEPS"
+  $pipProcess = Start-Process -FilePath $SCRIPTS_DIR\pip3.exe `
                 -ArgumentList "install", "-r", "$SALT_DEPS", "-U" `
                 -WorkingDirectory "$PROJECT_DIR" `
-                -Wait -WindowStyle Hidden
+                -Wait -PassThru
+  Write-Host "Pip process exited with code: $($pipProcess.ExitCode)"
   if ( Test-Path -Path "$SCRIPTS_DIR\distro.exe" ) {
       Write-Result "Success" -ForegroundColor Green
   } else {
+      Write-Host "distro.exe not found in $SCRIPTS_DIR" -ForegroundColor Red
       Write-Result "Failed" -ForegroundColor Red
       exit 1
   }
@@ -161,22 +163,28 @@ if ( ! (Test-Path -Path "$SCRIPTS_DIR\wmitest*") ) {
 $dlls = "pythoncom$($PY_MAJOR_VERSION)$($PY_MINOR_VERSION).dll",
         "pywintypes$($PY_MAJOR_VERSION)$($PY_MINOR_VERSION).dll"
 $dlls | ForEach-Object {
+    $sourcePath = "$SITE_PKGS_DIR\pywin32_system32\$_"
+    if ( -not ( Test-Path -Path "$sourcePath" ) ) {
+        Write-Host "Source DLL not found: $sourcePath" -ForegroundColor Yellow
+    }
     if ( -not ( Test-Path -Path "$SCRIPTS_DIR\$_" ) ) {
         Write-Host "Copying $_ to Scripts: " -NoNewline
-        Copy-Item "$SITE_PKGS_DIR\pywin32_system32\$_" "$SCRIPTS_DIR" -Force | Out-Null
+        Copy-Item "$sourcePath" "$SCRIPTS_DIR" -Force | Out-Null
         if ( Test-Path -Path "$SCRIPTS_DIR\$_") {
             Write-Result "Success" -ForegroundColor Green
         } else {
+            Write-Host "Failed to copy $_ to $SCRIPTS_DIR" -ForegroundColor Red
             Write-Result "Failed" -ForegroundColor Red
             exit 1
         }
     }
     if ( -not ( Test-Path -Path "$SITE_PKGS_DIR\win32\$_" ) ) {
-        Write-Host "Moving $_ to win32: " -NoNewline
-        Copy-Item "$SITE_PKGS_DIR\pywin32_system32\$_" "$SITE_PKGS_DIR\win32" -Force | Out-Null
+        Write-Host "Copying $_ to win32: " -NoNewline
+        Copy-Item "$sourcePath" "$SITE_PKGS_DIR\win32" -Force | Out-Null
         if ( Test-Path -Path "$SITE_PKGS_DIR\win32\$_" ) {
             Write-Result "Success" -ForegroundColor Green
         } else {
+            Write-Host "Failed to copy $_ to $SITE_PKGS_DIR\win32" -ForegroundColor Red
             Write-Result "Failed" -ForegroundColor Red
             exit 1
         }
@@ -256,7 +264,7 @@ if ( ! $SkipInstall ) {
       Start-Process -FilePath $SCRIPTS_DIR\pip3.exe `
                 -ArgumentList "install", $InstallPath `
                 -WorkingDirectory "$PROJECT_DIR" `
-                -Wait -WindowStyle Hidden
+                -Wait
   } finally {
       Remove-Item env:\RELENV_PIP_DIR
   }

pkg/windows/prep_salt.ps1

@@ -95,18 +95,20 @@ Write-Host $("-" * 80)
 # Verify Environment
 #-------------------------------------------------------------------------------
 
-Write-Host "Verifying Python Build: " -NoNewline
+Write-Host "Verifying Python Build at $PYTHON_BIN: " -NoNewline
 if ( Test-Path -Path "$PYTHON_BIN" ) {
     Write-Result "Success" -ForegroundColor Green
 } else {
+    Write-Host "python.exe not found at $PYTHON_BIN" -ForegroundColor Red
     Write-Result "Failed" -ForegroundColor Red
     exit 1
 }
 
-Write-Host "Verifying Salt Installation: " -NoNewline
+Write-Host "Verifying Salt Installation at $BUILD_DIR\salt-minion.exe: " -NoNewline
 if ( Test-Path -Path "$BUILD_DIR\salt-minion.exe" ) {
     Write-Result "Success" -ForegroundColor Green
 } else {
+    Write-Host "salt-minion.exe not found at $BUILD_DIR\salt-minion.exe" -ForegroundColor Red
     Write-Result "Failed" -ForegroundColor Red
     exit 1
 }