6161 echo "WINPYVERSION=${{ matrix.flavor_config.WINPYVERSION }}" >> $GITHUB_ENV
6262
6363 echo "build_location=${{ matrix.flavor_config.build_location }}" >> $GITHUB_ENV
64+ echo "dotwheelhouse=dotpython\\wheelhouse\\included.wheels" >> $GITHUB_ENV
65+ echo "destwheelhouse=${{ matrix.flavor_config.build_location }}\\wheelhouse\\included.wheels" >> $GITHUB_ENV
6466
6567 echo "WINPYVER2=${{ matrix.flavor_config.WINPYVER2 }}" >> $GITHUB_ENV
6668 echo "my_release_level=${{ matrix.flavor_config.my_release_level }}" >> $GITHUB_ENV
8082 echo "pandoc_source=https://github.com/jgm/pandoc/releases/download/3.1.9/pandoc-3.1.9-windows-x86_64.zip" >> $GITHUB_ENV
8183 echo "pandoc_sha256=11eb6dbe5286c9e5edb0cca4412e7d99ec6578ec04158b0b7fe11f7fd96688e5" >> $GITHUB_ENV
8284
85+
8386 - name : See variables
8487 shell : pwsh
8588 run : |
9598 Write-Output "WINPY7Z is $env:WINPY7Z"
9699 Write-Output "WINPYEXE is $env:WINPYEXE"
97100 Write-Output "build_location is $env:build_location"
101+ Write-Output "dotwheelhouse is $env:dotwheelhouse"
102+ Write-Output "destwheelhouse is $env:destwheelhouse"
98103 Write-Output "WINPYVER is $env:WINPYVER"
99104 Write-Output "WINPYVER2 is $env:WINPYVER2"
100105
@@ -129,7 +134,7 @@ jobs:
129134 shell : bash
130135 run : |
131136 cp -r winpython/portable/launchers_final/* dotpython/
132- mkdir "dotpython\wheelhouse"
137+ mkdir $env:dotwheelhouse
133138
134139 - name : List dotpython contents (for debugging)
135140 shell : pwsh
@@ -219,25 +224,25 @@ jobs:
219224 echo "WINPYARCH=$env:WINPYARCH" >> env.ini
220225 Copy-Item -Path "env.ini" -Destination "$destDir\env.ini"
221226
222- - name : Download main requirements to wheelhouse
227+ - name : Download main requirements to $env:dotwheelhouse
223228 shell : pwsh
224229 run : |
225- & "$env:build_location\python\python.exe" -m pip download --dest dotpython\wheelhouse --no-deps --require-hashes -r $env:WINPYrequirements
230+
231+ & "$env:build_location\python\python.exe" -m pip download --dest $env:dotwheelhouse --no-deps --require-hashes -r $env:WINPYrequirements
226232
227233 - name : Download additional wheelhouse requirements
228234 shell : pwsh
229235 run : |
230- $destwheelhouse="$env:build_location\wheelhouse"
231236 if ($env:WINPYrequirementswhl -eq "") {
232237 Write-Output "No additional wheelhouse requirements."
233238 } else {
234- & "$env:build_location\python\python.exe" -m pip download --dest $destwheelhouse --no-deps --require-hashes -r $env:WINPYrequirementswhl
239+ & "$env:build_location\python\python.exe" -m pip download --dest $env: destwheelhouse --no-deps --require-hashes -r $env:WINPYrequirementswhl
235240 }
236241
237242 - name : Install requirements
238243 shell : pwsh
239244 run : |
240- & "$env:build_location\python\python.exe" -m pip install --no-deps --no-index --trusted-
8201
host=None --find-links=dotpython\wheelhouse --require-hashes -r $env:WINPYrequirements
245+ & "$env:build_location\python\python.exe" -m pip install --no-deps --no-index --trusted-host=None --find-links=$env:dotwheelhouse --require-hashes -r $env:WINPYrequirements
241246
242247 - name : Generate Markdown content and pylock file
243248 shell : pwsh
@@ -254,7 +259,7 @@ jobs:
254259
255260 & "$env:build_location\python\python.exe" -m pip freeze | Out-File -FilePath dotpython\freeze.txt
256261 $destfile_pylock = "publish_output\pylock.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_').toml"
257- & "$env:build_location\python\python.exe" -m pip lock --no-deps --find-links=dotpython\wheelhouse -r dotpython\freeze.txt -o $destfile_pylock
262+ & "$env:build_location\python\python.exe" -m pip lock --no-deps --find-links=$env:dotwheelhouse -r dotpython\freeze.txt -o $destfile_pylock
258263
259264 $outreq = "publish_output\requir.$env:WINPYARCH-$($env:WINPYVER -replace '\.', '_').txt"
260265 & "$env:build_location\python\python.exe" -X utf8 -c "from wppm import wheelhouse as wh; wh.pylock_to_req(r'$destfile_pylock', r'$outreq')"
0 commit comments