This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12264

automation: delete code related to Python 2.7 support
ClosedPublic

Authored by indygreg on Mar 2 2022, 10:43 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG4561ec90d3c1: automation: delete code related to Python 2.7 support

Summary

The building of Inno and WiX installers took a python_version argument
that allowed us to specify "2" or "3" for the major Python version. Since
we no longer support Python 2, we can delete this argument and everything
feeding into it.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 2 2022, 10:43 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 2 2022, 10:43 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

indygreg added a child revision: D12265: packaging: remove py2exe / Python 2.7 support.Mar 2 2022, 10:43 AM

Alphare accepted this revision.Mar 3 2022, 5:55 AM

This revision is now accepted and ready to land.Mar 3 2022, 5:55 AM

indygreg added a commit: rHG4561ec90d3c1: automation: delete code related to Python 2.7 support.Mar 3 2022, 6:06 AM

Closed by commit rHG4561ec90d3c1: automation: delete code related to Python 2.7 support (authored by indygreg). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/automation/hgautomation/cli.py (67 lines)
M			contrib/automation/hgautomation/windows.py (9 lines)

Status	Author	Revision
Closed	indygreg	D12267 packaging: remove requirements constraints to support Python 2
Closed	indygreg	D12265 packaging: remove py2exe / Python 2.7 support
Closed	indygreg	D12264 automation: delete code related to Python 2.7 support
Closed	indygreg	D12263 automation: drop support for Python 2.7 in Windows environment
Closed	indygreg	D12262 automation: drop support for Python 2.7 in Linux environment
Closed	indygreg	D12261 automation: make system3 the default for run-tests-linux
Closed	indygreg	D12260 automation: run hg with python3

Diff 32448

contrib/automation/hgautomation/cli.py

	c = hga.aws_connection(aws_region)			c = hga.aws_connection(aws_region)
	image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)			image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)
	print('Windows development AMI available as %s' % image.id)			print('Windows development AMI available as %s' % image.id)


	def build_inno(			def build_inno(
	hga: HGAutomation,			hga: HGAutomation,
	aws_region,			aws_region,
	python_version,
	arch,			arch,
	revision,			revision,
	version,			version,
	base_image_name,			base_image_name,
	):			):
	c = hga.aws_connection(aws_region)			c = hga.aws_connection(aws_region)
	image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)			image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)
	DIST_PATH.mkdir(exist_ok=True)			DIST_PATH.mkdir(exist_ok=True)

	with aws.temporary_windows_dev_instances(c, image, 't3.medium') as insts:			with aws.temporary_windows_dev_instances(c, image, 't3.medium') as insts:
	instance = insts[0]			instance = insts[0]

	windows.synchronize_hg(SOURCE_ROOT, revision, instance)			windows.synchronize_hg(SOURCE_ROOT, revision, instance)

	for py_version in python_version:
	for a in arch:			for a in arch:
	windows.build_inno_installer(			windows.build_inno_installer(
	instance.winrm_client,			instance.winrm_client,
	py_version,
	a,			a,
	DIST_PATH,			DIST_PATH,
	version=version,			version=version,
	)			)


	def build_wix(			def build_wix(
	hga: HGAutomation,			hga: HGAutomation,
	aws_region,			aws_region,
	python_version,
	arch,			arch,
	revision,			revision,
	version,			version,
	base_image_name,			base_image_name,
	):			):
	c = hga.aws_connection(aws_region)			c = hga.aws_connection(aws_region)
	image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)			image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)
	DIST_PATH.mkdir(exist_ok=True)			DIST_PATH.mkdir(exist_ok=True)

	with aws.temporary_windows_dev_instances(c, image, 't3.medium') as insts:			with aws.temporary_windows_dev_instances(c, image, 't3.medium') as insts:
	instance = insts[0]			instance = insts[0]

	windows.synchronize_hg(SOURCE_ROOT, revision, instance)			windows.synchronize_hg(SOURCE_ROOT, revision, instance)

	for py_version in python_version:
	for a in arch:			for a in arch:
	windows.build_wix_installer(			windows.build_wix_installer(
	instance.winrm_client,			instance.winrm_client,
	py_version,
	a,			a,
	DIST_PATH,			DIST_PATH,
	version=version,			version=version,
	)			)


	def build_windows_wheel(			def build_windows_wheel(
	hga: HGAutomation,			hga: HGAutomation,
	aws_region,			aws_region,
	python_version,			python_version,
	arch,			arch,
	revision,			revision,
	windows.purge_hg(winrm_client)			windows.purge_hg(winrm_client)
	windows.build_wheel(			windows.build_wheel(
	winrm_client,			winrm_client,
	python_version=py_version,			python_version=py_version,
	arch=arch,			arch=arch,
	dest_path=DIST_PATH,			dest_path=DIST_PATH,
	)			)

	for py_version in (2, 3):
	for arch in ('x86', 'x64'):			for arch in ('x86', 'x64'):
	windows.purge_hg(winrm_client)			windows.purge_hg(winrm_client)
	windows.build_inno_installer(			windows.build_inno_installer(
	winrm_client, py_version, arch, DIST_PATH, version=version			winrm_client, arch, DIST_PATH, version=version
	)			)
	windows.build_wix_installer(			windows.build_wix_installer(
	winrm_client, py_version, arch, DIST_PATH, version=version			winrm_client, arch, DIST_PATH, version=version
	)			)


	def terminate_ec2_instances(hga: HGAutomation, aws_region):			def terminate_ec2_instances(hga: HGAutomation, aws_region):
	c = hga.aws_connection(aws_region, ensure_ec2_state=False)			c = hga.aws_connection(aws_region, ensure_ec2_state=False)
	aws.terminate_ec2_instances(c.ec2resource)			aws.terminate_ec2_instances(c.ec2resource)


	def purge_ec2_resources(hga: HGAutomation, aws_region):			def purge_ec2_resources(hga: HGAutomation, aws_region):
	)			)
	sp.set_defaults(func=build_all_windows_packages)			sp.set_defaults(func=build_all_windows_packages)

	sp = subparsers.add_parser(			sp = subparsers.add_parser(
	'build-inno',			'build-inno',
	help='Build Inno Setup installer(s)',			help='Build Inno Setup installer(s)',
	)			)
	sp.add_argument(			sp.add_argument(
	'--python-version',
	help='Which version of Python to target',
	choices={3},
	type=int,
	nargs='*',
	default=[3],
	)
	sp.add_argument(
	'--arch',			'--arch',
	help='Architecture to build for',			help='Architecture to build for',
	choices={'x86', 'x64'},			choices={'x86', 'x64'},
	nargs='*',			nargs='*',
	default=['x64'],			default=['x64'],
	)			)
	sp.add_argument(			sp.add_argument(
	'--revision',			'--revision',
	'--base-image-name',			'--base-image-name',
	help='AMI name of base image',			help='AMI name of base image',
	default=aws.WINDOWS_BASE_IMAGE_NAME,			default=aws.WINDOWS_BASE_IMAGE_NAME,
	)			)
	sp.set_defaults(func=build_windows_wheel)			sp.set_defaults(func=build_windows_wheel)

	sp = subparsers.add_parser('build-wix', help='Build WiX installer(s)')			sp = subparsers.add_parser('build-wix', help='Build WiX installer(s)')
	sp.add_argument(			sp.add_argument(
	'--python-version',
	help='Which version of Python to target',
	choices={3},
	type=int,
	nargs='*',
	default=[3],
	)
	sp.add_argument(
	'--arch',			'--arch',
	help='Architecture to build for',			help='Architecture to build for',
	choices={'x86', 'x64'},			choices={'x86', 'x64'},
	nargs='*',			nargs='*',
	default=['x64'],			default=['x64'],
	)			)
	sp.add_argument(			sp.add_argument(
	'--revision',			'--revision',

contrib/automation/hgautomation/windows.py

	source = r'C:\hgdev\src\dist\%s' % latest			source = r'C:\hgdev\src\dist\%s' % latest
	dest = dest_path / latest			dest = dest_path / latest
	print('copying %s to %s' % (source, dest))			print('copying %s to %s' % (source, dest))
	winrm_client.fetch(source, str(dest))			winrm_client.fetch(source, str(dest))


	def build_inno_installer(			def build_inno_installer(
	winrm_client,			winrm_client,
	python_version: int,
	arch: str,			arch: str,
	dest_path: pathlib.Path,			dest_path: pathlib.Path,
	version=None,			version=None,
	):			):
	"""Build the Inno Setup installer on a remote machine.			"""Build the Inno Setup installer on a remote machine.

	Using a WinRM client, remote commands are executed to build			Using a WinRM client, remote commands are executed to build
	a Mercurial Inno Setup installer.			a Mercurial Inno Setup installer.
	"""			"""
	print(			print('building Inno Setup installer for %s' % arch)
	'building Inno Setup installer for Python %d %s'
	% (python_version, arch)
	)

	# TODO fix this limitation in packaging code			# TODO fix this limitation in packaging code
	if not version:			if not version:
	raise Exception("version string is required when building for Python 3")			raise Exception("version string is required when building for Python 3")

	if arch == "x86":			if arch == "x86":
	target_triple = "i686-pc-windows-msvc"			target_triple = "i686-pc-windows-msvc"
	elif arch == "x64":			elif arch == "x64":
	)			)

	run_powershell(winrm_client, ps)			run_powershell(winrm_client, ps)
	copy_latest_dist(winrm_client, '*.whl', dest_path)			copy_latest_dist(winrm_client, '*.whl', dest_path)


	def build_wix_installer(			def build_wix_installer(
	winrm_client,			winrm_client,
	python_version: int,
	arch: str,			arch: str,
	dest_path: pathlib.Path,			dest_path: pathlib.Path,
	version=None,			version=None,
	):			):
	"""Build the WiX installer on a remote machine.			"""Build the WiX installer on a remote machine.

	Using a WinRM client, remote commands are executed to build a WiX installer.			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			# TODO fix this limitation in packaging code
	if not version:			if not version:
	raise Exception("version string is required when building for Python 3")			raise Exception("version string is required when building for Python 3")

	if arch == "x86":			if arch == "x86":
	target_triple = "i686-pc-windows-msvc"			target_triple = "i686-pc-windows-msvc"
	elif arch == "x64":			elif arch == "x64":

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	32355		Mar 2 2022, 10:43 AM	★	★
Diff 2	32448	rHG4561ec90d3c1e0f20b9bf95567a741e2674d973a	Feb 19 2022, 8:42 PM	★	★