##// END OF EJS Templates
automation: delete code related to Python 2.7 support...
Gregory Szorc -
r49702:4561ec90 default
parent child Browse files
Show More
@@ -65,7 +65,6 b' def bootstrap_windows_dev(hga: HGAutomat'
65 65 def build_inno(
66 66 hga: HGAutomation,
67 67 aws_region,
68 python_version,
69 68 arch,
70 69 revision,
71 70 version,
@@ -80,11 +79,9 b' def build_inno('
80 79
81 80 windows.synchronize_hg(SOURCE_ROOT, revision, instance)
82 81
83 for py_version in python_version:
84 82 for a in arch:
85 83 windows.build_inno_installer(
86 84 instance.winrm_client,
87 py_version,
88 85 a,
89 86 DIST_PATH,
90 87 version=version,
@@ -94,7 +91,6 b' def build_inno('
94 91 def build_wix(
95 92 hga: HGAutomation,
96 93 aws_region,
97 python_version,
98 94 arch,
99 95 revision,
100 96 version,
@@ -109,11 +105,9 b' def build_wix('
109 105
110 106 windows.synchronize_hg(SOURCE_ROOT, revision, instance)
111 107
112 for py_version in python_version:
113 108 for a in arch:
114 109 windows.build_wix_installer(
115 110 instance.winrm_client,
116 py_version,
117 111 a,
118 112 DIST_PATH,
119 113 version=version,
@@ -168,14 +162,13 b' def build_all_windows_packages('
168 162 dest_path=DIST_PATH,
169 163 )
170 164
171 for py_version in (2, 3):
172 165 for arch in ('x86', 'x64'):
173 166 windows.purge_hg(winrm_client)
174 167 windows.build_inno_installer(
175 winrm_client, py_version, arch, DIST_PATH, version=version
168 winrm_client, arch, DIST_PATH, version=version
176 169 )
177 170 windows.build_wix_installer(
178 winrm_client, py_version, arch, DIST_PATH, version=version
171 winrm_client, arch, DIST_PATH, version=version
179 172 )
180 173
181 174
@@ -340,14 +333,6 b' def get_parser():'
340 333 help='Build Inno Setup installer(s)',
341 334 )
342 335 sp.add_argument(
343 '--python-version',
344 help='Which version of Python to target',
345 choices={3},
346 type=int,
347 nargs='*',
348 default=[3],
349 )
350 sp.add_argument(
351 336 '--arch',
352 337 help='Architecture to build for',
353 338 choices={'x86', 'x64'},
@@ -402,14 +387,6 b' def get_parser():'
402 387
403 388 sp = subparsers.add_parser('build-wix', help='Build WiX installer(s)')
404 389 sp.add_argument(
405 '--python-version',
406 help='Which version of Python to target',
407 choices={3},
408 type=int,
409 nargs='*',
410 default=[3],
411 )
412 sp.add_argument(
413 390 '--arch',
414 391 help='Architecture to build for',
415 392 choices={'x86', 'x64'},
@@ -264,7 +264,6 b' def copy_latest_dist(winrm_client, patte'
264 264
265 265 def build_inno_installer(
266 266 winrm_client,
267 python_version: int,
268 267 arch: str,
269 268 dest_path: pathlib.Path,
270 269 version=None,
@@ -274,10 +273,7 b' def build_inno_installer('
274 273 Using a WinRM client, remote commands are executed to build
275 274 a Mercurial Inno Setup installer.
276 275 """
277 print(
278 'building Inno Setup installer for Python %d %s'
279 % (python_version, arch)
280 )
276 print('building Inno Setup installer for %s' % arch)
281 277
282 278 # TODO fix this limitation in packaging code
283 279 if not version:
@@ -319,7 +315,6 b' def build_wheel('
319 315
320 316 def build_wix_installer(
321 317 winrm_client,
322 python_version: int,
323 318 arch: str,
324 319 dest_path: pathlib.Path,
325 320 version=None,
@@ -328,7 +323,7 b' def build_wix_installer('
328 323
329 324 Using a WinRM client, remote commands are executed to build a WiX installer.
330 325 """
331 print('Building WiX installer for Python %d %s' % (python_version, arch))
326 print('Building WiX installer for %s' % arch)
332 327
333 328 # TODO fix this limitation in packaging code
334 329 if not version:
General Comments 0
You need to be logged in to leave comments. Login now