--- a/contrib/automation/hgautomation/cli.py Sat Feb 19 18:42:31 2022 -0700
+++ b/contrib/automation/hgautomation/cli.py Sat Feb 19 18:42:12 2022 -0700
@@ -65,7 +65,6 @@
def build_inno(
hga: HGAutomation,
aws_region,
- python_version,
arch,
revision,
version,
@@ -80,21 +79,18 @@
windows.synchronize_hg(SOURCE_ROOT, revision, instance)
- for py_version in python_version:
- for a in arch:
- windows.build_inno_installer(
- instance.winrm_client,
- py_version,
- a,
- DIST_PATH,
- version=version,
- )
+ for a in arch:
+ windows.build_inno_installer(
+ instance.winrm_client,
+ a,
+ DIST_PATH,
+ version=version,
+ )
def build_wix(
hga: HGAutomation,
aws_region,
- python_version,
arch,
revision,
version,
@@ -109,15 +105,13 @@
windows.synchronize_hg(SOURCE_ROOT, revision, instance)
- for py_version in python_version:
- for a in arch:
- windows.build_wix_installer(
- instance.winrm_client,
- py_version,
- a,
- DIST_PATH,
- version=version,
- )
+ for a in arch:
+ windows.build_wix_installer(
+ instance.winrm_client,
+ a,
+ DIST_PATH,
+ version=version,
+ )
def build_windows_wheel(
@@ -168,15 +162,14 @@
dest_path=DIST_PATH,
)
- for py_version in (2, 3):
- for arch in ('x86', 'x64'):
- windows.purge_hg(winrm_client)
- windows.build_inno_installer(
- winrm_client, py_version, arch, DIST_PATH, version=version
- )
- windows.build_wix_installer(
- winrm_client, py_version, arch, DIST_PATH, version=version
- )
+ for arch in ('x86', 'x64'):
+ windows.purge_hg(winrm_client)
+ windows.build_inno_installer(
+ winrm_client, arch, DIST_PATH, version=version
+ )
+ windows.build_wix_installer(
+ winrm_client, arch, DIST_PATH, version=version
+ )
def terminate_ec2_instances(hga: HGAutomation, aws_region):
@@ -340,14 +333,6 @@
help='Build Inno Setup installer(s)',
)
sp.add_argument(
- '--python-version',
- help='Which version of Python to target',
- choices={3},
- type=int,
- nargs='*',
- default=[3],
- )
- sp.add_argument(
'--arch',
help='Architecture to build for',
choices={'x86', 'x64'},
@@ -402,14 +387,6 @@
sp = subparsers.add_parser('build-wix', help='Build WiX installer(s)')
sp.add_argument(
- '--python-version',
- help='Which version of Python to target',
- choices={3},
- type=int,
- nargs='*',
- default=[3],
- )
- sp.add_argument(
'--arch',
help='Architecture to build for',
choices={'x86', 'x64'},
--- a/contrib/automation/hgautomation/windows.py Sat Feb 19 18:42:31 2022 -0700
+++ b/contrib/automation/hgautomation/windows.py Sat Feb 19 18:42:12 2022 -0700
@@ -264,7 +264,6 @@
def build_inno_installer(
winrm_client,
- python_version: int,
arch: str,
dest_path: pathlib.Path,
version=None,
@@ -274,10 +273,7 @@
Using a WinRM client, remote commands are executed to build
a Mercurial Inno Setup installer.
"""
- print(
- 'building Inno Setup installer for Python %d %s'
- % (python_version, arch)
- )
+ print('building Inno Setup installer for %s' % arch)
# TODO fix this limitation in packaging code
if not version:
@@ -319,7 +315,6 @@
def build_wix_installer(
winrm_client,
- python_version: int,
arch: str,
dest_path: pathlib.Path,
version=None,
@@ -328,7 +323,7 @@
Using a WinRM client, remote commands are executed to build a WiX installer.
"""
- print('Building WiX installer for Python %d %s' % (python_version, arch))
+ print('Building WiX installer for %s' % arch)
# TODO fix this limitation in packaging code
if not version: