winpython · stonebig · Aug 31, 2025 · Aug 31, 2025
diff --git a/.github/workflows/github_workflows_build-all_3.13.yml b/.github/workflows/github_workflows_build-all_3.13.yml
@@ -17,55 +17,55 @@ jobs:
         # Define different WinPython build configurations
         flavor_config:
           # WinPython Dot configuration
-          - FLAVOR: "dotc"
+          - FLAVOR: "dot"
             REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt"
             REQUIREMENTS_WHL: ""
             ZIP: "1"
             SEVEN_Z: "0"
             EXE: "1"
             PANDOC: "0"
-            ARTIFACT_NAME: "publish_313dotc"
+            ARTIFACT_NAME: "publish_313dot"
             python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.13.7+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
             python_sha256f: "d60173a7693c3134b8364814b80f98ddde0638e0e75e5b004f37452fccf67a33"
             WINPYARCH: "64"
             WINPYVERSION: "313"
             WINPYVER2: "3.13.7.0"
-            my_release_level: "b3"
-            build_location: "WPy64-3170b3"
+            my_release_level: "b4"
+            build_location: "WPy64-3170b4"
 
           # WinPython Slim configuration
-          - FLAVOR: "slimc"
+          - FLAVOR: "slim"
             REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0slimb4.txt"
             REQUIREMENTS_WHL: ""
             ZIP: "0"
             SEVEN_Z: "1"
             EXE: "1"
             PANDOC: "1"
-            ARTIFACT_NAME: "publish_313slimc"
+            ARTIFACT_NAME: "publish_313slim"
             python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.13.7+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
             python_sha256f: "d60173a7693c3134b8364814b80f98ddde0638e0e75e5b004f37452fccf67a33"
             WINPYARCH: "64"
             WINPYVERSION: "313"
             WINPYVER2: "3.13.7.0"
-            my_release_level: "b3"
-            build_location: "WPy64-3170b3"
+            my_release_level: "b4"
+            build_location: "WPy64-3170b4"
 
           # WinPython Whl configuration
           - FLAVOR: "whlc"
-            REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt" # Note: Original whl used dotb3 requirements, verify if this is intended
+            REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0dotb4.txt" # Note: Original whl used dot requirements, verify if this is intended
             REQUIREMENTS_WHL: "winpython\\portable\\cycle_2025_04\\requir.64-3_13_7_0whlb4_wheels.txt"
             ZIP: "0"
             SEVEN_Z: "1"
             EXE: "0"
             PANDOC: "0"
-            ARTIFACT_NAME: "publish_313whlc"
+            ARTIFACT_NAME: "publish_313whl"
             python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.13.7+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
             python_sha256f: "d60173a7693c3134b8364814b80f98ddde0638e0e75e5b004f37452fccf67a33"
             WINPYARCH: "64"
             WINPYVERSION: "313"
             WINPYVER2: "3.13.7.0"
-            my_release_level: "b3"
-            build_location: "WPy64-3170b3"
+            my_release_level: "b4"
+            build_location: "WPy64-3170b4"
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/github_workflows_build-all_3.14.yml b/.github/workflows/github_workflows_build-all_3.14.yml
@@ -17,37 +17,38 @@ jobs:
         # Define different WinPython build configurations
         flavor_config:
           # WinPython Dot configuration
-          - FLAVOR: "dotc"
+          - FLAVOR: "dot"
             REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_14_0_1dotb3.txt"
             REQUIREMENTS_WHL: ""
             ZIP: "1"
             SEVEN_Z: "0"
             EXE: "1"
             PANDOC: "0"
-            ARTIFACT_NAME: "publish_314dotc"
+            ARTIFACT_NAME: "publish_314dot"
             python_sourcef: "https://github.com/astral-sh/python-build-standalone/releases/download/20250818/cpython-3.14.0rc2+20250818-x86_64-pc-windows-msvc-install_only_stripped.tar.gz"
             python_sha256f: "361a49531a5d4bdc72bbccc81f7b5881b5eb751e3b47683b233cacae5aeeaeed"
             WINPYARCH: "64"
             WINPYVERSION: "314"
             WINPYVER2: "3.14.0.1"
-            my_release_level: "b3"
-            build_location: "WPy64-31401b3"
+            my_release_level: "b4"
+            build_location: "WPy64-31401b4"
 
-          - FLAVOR: "freec"
+
+          - FLAVOR: "free"
             REQUIREMENTS: "winpython\\portable\\cycle_2025_04\\requir.64-3_14_0_1dotb3.txt"
             REQUIREMENTS_WHL: ""
             ZIP: "1"
             SEVEN_Z: "0"
             EXE: "1"
             PANDOC: "0"
-            ARTIFACT_NAME: "publish_314freec"
+            ARTIFACT_NAME: "publish_314free"
             python_sourcef: "https://github.com/winpython/winpy.github.io/releases/download/20250825/cpython-3.14.0rc2+20250825-x86_64-pc-windows-msvc-freethreaded-install_only_stripped.tar.gz"
             python_sha256f: "dda491993214ae78948297848aa9d75d1d10762c33ff16487793ca5205516e4a"
             WINPYARCH: "64"
             WINPYVERSION: "314"
             WINPYVER2: "3.14.0.1"
-            my_release_level: "b3"
-            build_location: "WPy64-31401b3"
+            my_release_level: "b4"
+            build_location: "WPy64-31401b4"
 
     steps:
       - name: Checkout repository
@@ -264,6 +265,19 @@ jobs:
           $outreq = "publish_output\requir.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_').txt"
           & "$env:build_location\python\python.exe" -X utf8 -c "from wppm import wheelhouse as wh; wh.pylock_to_req(r'$destfile_pylock', r'$outreq')"
 
+          if ($env:WINPYrequirementswhl -eq "") {
+              Write-Output "No additional wheelhouse requirements."
+          } else {
+          $destfile_pylockwheel = "publish_output\pylock.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_')_wheels.toml"
+          & "$env:build_location\python\python.exe" -m pip lock --no-deps --require-hashes -r $env:WINPYrequirementswhl -o $destfile_pylockwheel
+
+          $outreqwheel = "publish_output\requir.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_')_wheels.txt"
+          & "$env:build_location\python\python.exe" -X utf8 -c "from wppm import wheelhouse as wh; wh.pylock_to_req(r'$destfile_pylockwheel', r'$outreqwheel')"
+          Copy-Item -Path $outreqwheel -Destination (Join-Path  $env:build_location "wheelhouse") -Force         
+          Copy-Item -Path $destfile_pylockwheel -Destination (Join-Path  $env:build_location "wheelhouse") -Force         
+
+          }
+
       - name: Zip the result
         shell: pwsh
         if: ${{ matrix.flavor_config.ZIP == '1' }}