equal
deleted
inserted
replaced
360 target_triple = "x86_64-pc-windows-msvc" |
360 target_triple = "x86_64-pc-windows-msvc" |
361 else: |
361 else: |
362 raise Exception("unhandled arch: %s" % arch) |
362 raise Exception("unhandled arch: %s" % arch) |
363 |
363 |
364 ps = BUILD_INNO_PYTHON3.format( |
364 ps = BUILD_INNO_PYTHON3.format( |
365 pyoxidizer_target=target_triple, version=version, |
365 pyoxidizer_target=target_triple, |
|
366 version=version, |
366 ) |
367 ) |
367 else: |
368 else: |
368 extra_args = [] |
369 extra_args = [] |
369 if version: |
370 if version: |
370 extra_args.extend(['--version', version]) |
371 extra_args.extend(['--version', version]) |
425 target_triple = "x86_64-pc-windows-msvc" |
426 target_triple = "x86_64-pc-windows-msvc" |
426 else: |
427 else: |
427 raise Exception("unhandled arch: %s" % arch) |
428 raise Exception("unhandled arch: %s" % arch) |
428 |
429 |
429 ps = BUILD_WIX_PYTHON3.format( |
430 ps = BUILD_WIX_PYTHON3.format( |
430 pyoxidizer_target=target_triple, version=version, |
431 pyoxidizer_target=target_triple, |
|
432 version=version, |
431 ) |
433 ) |
432 else: |
434 else: |
433 extra_args = [] |
435 extra_args = [] |
434 if version: |
436 if version: |
435 extra_args.extend(['--version', version]) |
437 extra_args.extend(['--version', version]) |
458 if arch not in ('x86', 'x64'): |
460 if arch not in ('x86', 'x64'): |
459 raise ValueError('arch must be x86 or x64; got %s' % arch) |
461 raise ValueError('arch must be x86 or x64; got %s' % arch) |
460 |
462 |
461 python_path = 'python%s-%s' % (python_version.replace('.', ''), arch) |
463 python_path = 'python%s-%s' % (python_version.replace('.', ''), arch) |
462 |
464 |
463 ps = RUN_TESTS.format(python_path=python_path, test_flags=test_flags or '',) |
465 ps = RUN_TESTS.format( |
|
466 python_path=python_path, |
|
467 test_flags=test_flags or '', |
|
468 ) |
464 |
469 |
465 run_powershell(winrm_client, ps) |
470 run_powershell(winrm_client, ps) |
466 |
471 |
467 |
472 |
468 def resolve_wheel_artifacts(dist_path: pathlib.Path, version: str): |
473 def resolve_wheel_artifacts(dist_path: pathlib.Path, version: str): |