Commit 4a4cab0
committed
Fix Python 3.15 validation on Windows and macOS
Now that 3.15/3.15t are in the default matrix on every OS (#8427), the
uv-based interpreter setup runs on Windows and macOS for the first time and
breaks in three places:
1. Windows: uv lays a venv out as Scripts/, not bin/, so
`source ${ENV_NAME}/bin/activate` failed outright with
"conda-env-<id>/bin/activate: No such file or directory".
2. macOS: the macos-arm64 workaround prepends ${CONDA_PREFIX}/bin to PATH.
On the uv path no conda env was activated, so CONDA_PREFIX still pointed at
base (python 3.14) and shadowed the venv's python3/pip3 -- the run installed
and smoke-tested torch under conda base 3.14 instead of 3.15.
3. Cleanup: ENV_NAME is a conda env name on the conda path but a venv directory
on the uv path, so `conda env remove -n` fails with
EnvironmentLocationNotFound and, under set -e, fails the job after the tests
have already passed.
The conda path for 3.10-3.14t is unchanged.1 parent fc982f6 commit 4a4cab0
1 file changed
Lines changed: 28 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | | - | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
219 | 223 | | |
220 | 224 | | |
221 | | - | |
222 | | - | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
223 | 235 | | |
224 | 236 | | |
225 | 237 | | |
| |||
316 | 328 | | |
317 | 329 | | |
318 | 330 | | |
| 331 | + | |
319 | 332 | | |
| 333 | + | |
320 | 334 | | |
321 | 335 | | |
322 | 336 | | |
323 | 337 | | |
324 | 338 | | |
325 | 339 | | |
326 | 340 | | |
327 | | - | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
328 | 347 | | |
329 | 348 | | |
330 | 349 | | |
| |||
334 | 353 | | |
335 | 354 | | |
336 | 355 | | |
337 | | - | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
338 | 361 | | |
339 | 362 | | |
340 | 363 | | |
| |||
0 commit comments