diff contrib/packaging/hgpackaging/py2exe.py @ 43076:2372284d9457

formatting: blacken the codebase

This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.

Done with:

  hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S

# skip-blame mass-reformatting only

# no-check-commit reformats foo_bar functions

Differential Revision: https://phab.mercurial-scm.org/D6971

--- a/contrib/packaging/hgpackaging/py2exe.py	Sat Oct 05 10:29:34 2019 -0400
+++ b/contrib/packaging/hgpackaging/py2exe.py	Sun Oct 06 09:45:02 2019 -0400
@@ -11,9 +11,7 @@
 import pathlib
 import subprocess
 
-from .downloads import (
-    download_entry,
-)
+from .downloads import download_entry
 from .util import (
     extract_tar_to_directory,
     extract_zip_to_directory,
@@ -21,12 +19,17 @@
 )
 
 
-def build_py2exe(source_dir: pathlib.Path, build_dir: pathlib.Path,
-                 python_exe: pathlib.Path, build_name: str,
-                 venv_requirements_txt: pathlib.Path,
-                 extra_packages=None, extra_excludes=None,
-                 extra_dll_excludes=None,
-                 extra_packages_script=None):
+def build_py2exe(
+    source_dir: pathlib.Path,
+    build_dir: pathlib.Path,
+    python_exe: pathlib.Path,
+    build_name: str,
+    venv_requirements_txt: pathlib.Path,
+    extra_packages=None,
+    extra_excludes=None,
+    extra_dll_excludes=None,
+    extra_packages_script=None,
+):
     """Build Mercurial with py2exe.
 
     Build files will be placed in ``build_dir``.
@@ -36,9 +39,11 @@
     to already be configured with an active toolchain.
     """
     if 'VCINSTALLDIR' not in os.environ:
-        raise Exception('not running from a Visual C++ build environment; '
-                        'execute the "Visual C++ <version> Command Prompt" '
-                        'application shortcut or a vcsvarsall.bat file')
+        raise Exception(
+            'not running from a Visual C++ build environment; '
+            'execute the "Visual C++ <version> Command Prompt" '
+            'application shortcut or a vcsvarsall.bat file'
+        )
 
     # Identity x86/x64 and validate the environment matches the Python
     # architecture.
@@ -48,12 +53,16 @@
 
     if vc_x64:
         if py_info['arch'] != '64bit':
-            raise Exception('architecture mismatch: Visual C++ environment '
-                            'is configured for 64-bit but Python is 32-bit')
+            raise Exception(
+                'architecture mismatch: Visual C++ environment '
+                'is configured for 64-bit but Python is 32-bit'
+            )
     else:
         if py_info['arch'] != '32bit':
-            raise Exception('architecture mismatch: Visual C++ environment '
-                            'is configured for 32-bit but Python is 64-bit')
+            raise Exception(
+                'architecture mismatch: Visual C++ environment '
+                'is configured for 32-bit but Python is 64-bit'
+            )
 
     if py_info['py3']:
         raise Exception('Only Python 2 is currently supported')
@@ -65,11 +74,11 @@
     virtualenv_pkg, virtualenv_entry = download_entry('virtualenv', build_dir)
     py2exe_pkg, py2exe_entry = download_entry('py2exe', build_dir)
 
-    venv_path = build_dir / ('venv-%s-%s' % (build_name,
-                                             'x64' if vc_x64 else 'x86'))
+    venv_path = build_dir / (
+        'venv-%s-%s' % (build_name, 'x64' if vc_x64 else 'x86')
+    )
 
-    gettext_root = build_dir / (
-        'gettext-win-%s' % gettext_entry['version'])
+    gettext_root = build_dir / ('gettext-win-%s' % gettext_entry['version'])
 
     if not gettext_root.exists():
         extract_zip_to_directory(gettext_pkg, gettext_root)
@@ -77,7 +86,8 @@
 
     # This assumes Python 2. We don't need virtualenv on Python 3.
     virtualenv_src_path = build_dir / (
-        'virtualenv-%s' % virtualenv_entry['version'])
+        'virtualenv-%s' % virtualenv_entry['version']
+    )
     virtualenv_py = virtualenv_src_path / 'virtualenv.py'
 
     if not virtualenv_src_path.exists():
@@ -91,14 +101,15 @@
     if not venv_path.exists():
         print('creating virtualenv with dependencies')
         subprocess.run(
-            [str(python_exe), str(virtualenv_py), str(venv_path)],
-            check=True)
+            [str(python_exe), str(virtualenv_py), str(venv_path)], check=True
+        )
 
     venv_python = venv_path / 'Scripts' / 'python.exe'
     venv_pip = venv_path / 'Scripts' / 'pip.exe'
 
-    subprocess.run([str(venv_pip), 'install', '-r', str(venv_requirements_txt)],
-                   check=True)
+    subprocess.run(
+        [str(venv_pip), 'install', '-r', str(venv_requirements_txt)], check=True
+    )
 
     # Force distutils to use VC++ settings from environment, which was
     # validated above.
@@ -107,9 +118,13 @@
     env['MSSdk'] = '1'
 
     if extra_packages_script:
-        more_packages = set(subprocess.check_output(
-            extra_packages_script,
-            cwd=build_dir).split(b'\0')[-1].strip().decode('utf-8').splitlines())
+        more_packages = set(
+            subprocess.check_output(extra_packages_script, cwd=build_dir)
+            .split(b'\0')[-1]
+            .strip()
+            .decode('utf-8')
+            .splitlines()
+        )
         if more_packages:
             if not extra_packages:
                 extra_packages = more_packages
@@ -119,32 +134,38 @@
     if extra_packages:
         env['HG_PY2EXE_EXTRA_PACKAGES'] = ' '.join(sorted(extra_packages))
         hgext3rd_extras = sorted(
-            e for e in extra_packages if e.startswith('hgext3rd.'))
+            e for e in extra_packages if e.startswith('hgext3rd.')
+        )
         if hgext3rd_extras:
             env['HG_PY2EXE_EXTRA_INSTALL_PACKAGES'] = ' '.join(hgext3rd_extras)
     if extra_excludes:
         env['HG_PY2EXE_EXTRA_EXCLUDES'] = ' '.join(sorted(extra_excludes))
     if extra_dll_excludes:
         env['HG_PY2EXE_EXTRA_DLL_EXCLUDES'] = ' '.join(
-            sorted(extra_dll_excludes))
+            sorted(extra_dll_excludes)
+        )
 
     py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe'
     if not py2exe_py_path.exists():
         print('building py2exe')
-        subprocess.run([str(venv_python), 'setup.py', 'install'],
-                       cwd=py2exe_source_path,
-                       env=env,
-                       check=True)
+        subprocess.run(
+            [str(venv_python), 'setup.py', 'install'],
+            cwd=py2exe_source_path,
+            env=env,
+            check=True,
+        )
 
     # Register location of msgfmt and other binaries.
     env['PATH'] = '%s%s%s' % (
-        env['PATH'], os.pathsep, str(gettext_root / 'bin'))
+        env['PATH'],
+        os.pathsep,
+        str(gettext_root / 'bin'),
+    )
 
     print('building Mercurial')
     subprocess.run(
-        [str(venv_python), 'setup.py',
-         'py2exe',
-         'build_doc', '--html'],
+        [str(venv_python), 'setup.py', 'py2exe', 'build_doc', '--html'],
         cwd=str(source_dir),
         env=env,
-        check=True)
+        check=True,
+    )