reformat all, update to pyinstaller v6.9.0

Author: mastercoms

pbpy/pbbutler.py

@@ -6,24 +6,26 @@
 from pbpy import pblog, pbtools, pbunreal
 
 
-def publish_build(branch_type, butler_exec_path, publish_stagedir, butler_project, butler_manifest):
+def publish_build(
+    branch_type, butler_exec_path, publish_stagedir, butler_project, butler_manifest
+):
     # Test if our configuration values exist
     if not butler_project or not butler_manifest:
         pblog.error("butler was not configured.")
         return False
 
     if branch_type == "default":
-      branch_type = "internal"
+        branch_type = "internal"
 
     plat = platform.system()
     if plat == "Windows":
-      plat = "win"
+        plat = "win"
     elif plat == "Darwin":
-      plat = "mac"
+        plat = "mac"
     elif plat == "Linux":
-      plat = "linux"
+        plat = "linux"
     else:
-      plat = plat.lower()
+        plat = plat.lower()
 
     manifest_path = Path(publish_stagedir) / ".itch.toml"
 
@@ -32,7 +34,16 @@ def publish_build(branch_type, butler_exec_path, publish_stagedir, butler_projec
     channel = f"{branch_type}-{plat}"
 
     # Push and Publish the build
-    proc = pbtools.run([butler_exec_path, "push", publish_stagedir, f"{butler_project}:{channel}", "--userversion", pbunreal.get_project_version()])
+    proc = pbtools.run(
+        [
+            butler_exec_path,
+            "push",
+            publish_stagedir,
+            f"{butler_project}:{channel}",
+            "--userversion",
+            pbunreal.get_project_version(),
+        ]
+    )
     result = proc.returncode
     manifest_path.unlink()
     return result

pbpy/pbconfig.py

@@ -11,6 +11,7 @@
 
 user_config = None
 
+
 def get(key):
     if key is None or config is None or config.get(str(key)) is None:
         pbtools.error_state(f"Invalid config get request: {key}", hush=True)
@@ -23,7 +24,7 @@ def get(key):
 
 @lru_cache()
 def get_user_config_filename():
-    config_key = 'ci_config' if get("is_ci") else 'user_config'
+    config_key = "ci_config" if get("is_ci") else "user_config"
     return get(config_key)
 
 
@@ -35,7 +36,9 @@ def __getitem__(self, key):
 
 
 class CustomInterpolation(configparser.BasicInterpolation):
-    def before_get(self, parser, section: str, option: str, value: str, defaults) -> str:
+    def before_get(
+        self, parser, section: str, option: str, value: str, defaults
+    ) -> str:
         val = super().before_get(parser, section, option, value, defaults)
         if get("is_ci"):
             return os.getenv(val)
@@ -53,6 +56,7 @@ def get_user_config():
         init_user_config()
     return user_config
 
+
 def get_user(section, key, default=None):
     return get_user_config().get(section, key, fallback=default)
 
@@ -64,10 +68,13 @@ def shutdown():
         restore_hidden = False
         if os.name == "nt" and os.path.exists(user_filename):
             import win32api, win32con
+
             attributes = win32api.GetFileAttributes(user_filename)
             restore_hidden = attributes & win32con.FILE_ATTRIBUTE_HIDDEN
-            win32api.SetFileAttributes(user_filename, attributes & ~win32con.FILE_ATTRIBUTE_HIDDEN)
-        with open(user_filename, 'w') as user_config_file:
+            win32api.SetFileAttributes(
+                user_filename, attributes & ~win32con.FILE_ATTRIBUTE_HIDDEN
+            )
+        with open(user_filename, "w") as user_config_file:
             user_config.write(user_config_file)
         if restore_hidden:
             win32api.SetFileAttributes(user_filename, attributes)
@@ -95,7 +102,9 @@ def generate_config(config_path, parser_func):
             return False
 
         # Add CI information
-        config["is_ci"] = os.getenv('PBSYNC_CI') is not None or os.getenv('CI') is not None
+        config["is_ci"] = (
+            os.getenv("PBSYNC_CI") is not None or os.getenv("CI") is not None
+        )
         config["checksum_file"] = ".checksum"
 
         return True

pbpy/pbdatasync.py

@@ -5,49 +5,65 @@
 
 
 def get_oid(path):
-  oid_pairs = pbtools.get_combined_output(pbgit.get_lfs_executable(), "ls-files", "-l", "-I", path).splitlines()
-  for oid_pair in oid_pairs:
-    oid_pair = oid_pair.split(" * ")
-    oid = oid_pair[0]
-    file = oid_pair[1]
-    yield oid, file
+    oid_pairs = pbtools.get_combined_output(
+        pbgit.get_lfs_executable(), "ls-files", "-l", "-I", path
+    ).splitlines()
+    for oid_pair in oid_pairs:
+        oid_pair = oid_pair.split(" * ")
+        oid = oid_pair[0]
+        file = oid_pair[1]
+        yield oid, file
 
 
 def get_remote_file_name(file, oid=None):
-  if oid is None:
-    oid = get_oid(file)
-  file = file.replace(".umap", "")
-  return f"{file}/{file}_BuiltData_{oid}.uasset"
+    if oid is None:
+        oid = get_oid(file)
+    file = file.replace(".umap", "")
+    return f"{file}/{file}_BuiltData_{oid}.uasset"
 
 
 def get_remote_path(file, oid=None):
-  file_name = get_remote_file_name(file, oid)
-  gcs_uri = f"{pbunreal.get_ddc_gsuri()}{pbconfig.get('ddc_key')}"
-  return f"{gcs_uri}/BuiltData/{file_name}"
+    file_name = get_remote_file_name(file, oid)
+    gcs_uri = f"{pbunreal.get_ddc_gsuri()}{pbconfig.get('ddc_key')}"
+    return f"{gcs_uri}/BuiltData/{file_name}"
 
 
 def get_all_maps():
-  include_globs = pbconfig.get_user("project", "include", default="Content").split(",")
-  include_globs = [path.strip() for path in include_globs]
-  for glob in include_globs:
-    yield get_oid(f"{glob}/**/*.umap")
+    include_globs = pbconfig.get_user("project", "include", default="Content").split(
+        ","
+    )
+    include_globs = [path.strip() for path in include_globs]
+    for glob in include_globs:
+        yield get_oid(f"{glob}/**/*.umap")
 
 
 def pull_data():
-  for oid, file in get_all_maps():
-    remote_file = get_remote_path(file, oid)
-    data_path = file.replace(".umap", "_BuildData.uasset")
-    command_runner = pbunreal.init_gcs()
-    try:
-      command_runner.RunNamedCommand('rsync', args=["-Cir", remote_file, data_path], collect_analytics=False, skip_update_check=True, parallel_operations=True)
-    except:
-      # keep going
-      pass
+    for oid, file in get_all_maps():
+        remote_file = get_remote_path(file, oid)
+        data_path = file.replace(".umap", "_BuildData.uasset")
+        command_runner = pbunreal.init_gcs()
+        try:
+            command_runner.RunNamedCommand(
+                "rsync",
+                args=["-Cir", remote_file, data_path],
+                collect_analytics=False,
+                skip_update_check=True,
+                parallel_operations=True,
+            )
+        except:
+            # keep going
+            pass
 
 
 def push_data():
-  for oid, file in get_all_maps():
-    remote_file = get_remote_path(file, oid)
-    data_path = file.replace(".umap", "_BuildData.uasset")
-    command_runner = pbunreal.init_gcs()
-    command_runner.RunNamedCommand('rsync', args=["-Cir", data_path, remote_file], collect_analytics=False, skip_update_check=True, parallel_operations=True)
+    for oid, file in get_all_maps():
+        remote_file = get_remote_path(file, oid)
+        data_path = file.replace(".umap", "_BuildData.uasset")
+        command_runner = pbunreal.init_gcs()
+        command_runner.RunNamedCommand(
+            "rsync",
+            args=["-Cir", data_path, remote_file],
+            collect_analytics=False,
+            skip_update_check=True,
+            parallel_operations=True,
+        )

pbpy/pbdispatch.py

@@ -7,24 +7,34 @@
 
 def publish_build(branch_type, dispath_exec_path, publish_stagedir, dispatch_config):
     # Test if our configuration values exist
-    app_id = pbconfig.get_user('dispatch', 'app_id')
+    app_id = pbconfig.get_user("dispatch", "app_id")
     if not app_id or not dispatch_config:
         pblog.error("dispatch was not configured.")
         return False
 
     if branch_type == "default":
-      branch_type = "internal"
+        branch_type = "internal"
 
     branch_id_key = f"{branch_type}_bid"
-    branch_id = pbconfig.get_user('dispatch', branch_id_key)
+    branch_id = pbconfig.get_user("dispatch", branch_id_key)
     if branch_id is None or branch_id == "":
         pblog.error(f"{branch_id_key} was not configured.")
         return False
 
     # Push and Publish the build
     retry = True
     while True:
-        proc = pbtools.run([dispath_exec_path, "build", "push", branch_id, dispatch_config, publish_stagedir, "-p"])
+        proc = pbtools.run(
+            [
+                dispath_exec_path,
+                "build",
+                "push",
+                branch_id,
+                dispatch_config,
+                publish_stagedir,
+                "-p",
+            ]
+        )
         result = proc.returncode
         if result != 0:
             if not retry:

pbpy/pbengine.py

@@ -8,13 +8,16 @@
 from pbpy import pbgit
 from pbpy import pbuac
 
+
 def generate_module_changes(old_commitish, new_commitish):
-    proc = pbtools.run_with_combined_output([
-        pbgit.get_git_executable(),
-        "diff",
-        "--cumulative",
-        f"{old_commitish}...{new_commitish}"
-    ])
+    proc = pbtools.run_with_combined_output(
+        [
+            pbgit.get_git_executable(),
+            "diff",
+            "--cumulative",
+            f"{old_commitish}...{new_commitish}",
+        ]
+    )
     if proc.returncode != 0:
         pbtools.error_state(proc.stdout)
     diffs = reversed(proc.stdout.splitlines())
@@ -25,8 +28,5 @@ def generate_module_changes(old_commitish, new_commitish):
         folder = diff.split("% ")[1]
         folders.add(Path(folder))
     module_delta = dict()
-    with open("modules.delta.json" , "w") as f:
+    with open("modules.delta.json", "w") as f:
         json.dump(module_delta, f)
-
-
-