From 1f77084c8e88a3fabae3d44c33fe721bbb653abe Mon Sep 17 00:00:00 2001 From: Pyre Bot Jr <> Date: Thu, 17 Feb 2022 22:54:34 -0800 Subject: [PATCH] Add annotations to `opensource/fbcode_builder` Reviewed By: shannonzhu Differential Revision: D34332682 fbshipit-source-id: 498c63851f98dd76502a20a9d1589df5b0c4e7b9 --- build/fbcode_builder/getdeps/builder.py | 8 ++++---- build/fbcode_builder/getdeps/buildopts.py | 6 +++--- build/fbcode_builder/getdeps/cargo.py | 2 +- build/fbcode_builder/getdeps/envfuncs.py | 4 ++-- build/fbcode_builder/getdeps/fetcher.py | 4 ++-- build/fbcode_builder/getdeps/py_wheel_builder.py | 2 +- build/fbcode_builder/getdeps/runcmd.py | 2 +- build/fbcode_builder/shell_quoting.py | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index bff4adc63..17061953a 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -86,14 +86,14 @@ class BuilderBase(object): allow_fail=allow_fail, ) - def _reconfigure(self, reconfigure): + def _reconfigure(self, reconfigure) -> bool: if self.build_dir is not None: if not os.path.isdir(self.build_dir): os.makedirs(self.build_dir) reconfigure = True return reconfigure - def prepare(self, install_dirs, reconfigure): + def prepare(self, install_dirs, reconfigure) -> None: print("Preparing %s..." % self.manifest.name) reconfigure = self._reconfigure(reconfigure) self._prepare(install_dirs=install_dirs, reconfigure=reconfigure) @@ -143,7 +143,7 @@ class BuilderBase(object): raise an exception.""" pass - def _prepare(self, install_dirs, reconfigure): + def _prepare(self, install_dirs, reconfigure) -> None: """Prepare the build. Useful when need to generate config, but builder is not the primary build system. e.g. cargo when called from cmake""" @@ -690,7 +690,7 @@ if __name__ == "__main__": return define_args - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, install_dirs, reconfigure: bool) -> None: reconfigure = reconfigure or self._needs_reconfigure() env = self._compute_env(install_dirs) diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index 8c377691a..90c5012db 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -176,7 +176,7 @@ class BuildOptions(object): def is_freebsd(self): return self.host_type.is_freebsd() - def get_num_jobs(self, job_weight: int): + def get_num_jobs(self, job_weight: int) -> int: """Given an estimated job_weight in MiB, compute a reasonable concurrency limit.""" if self.specified_num_jobs: return self.specified_num_jobs @@ -315,7 +315,7 @@ class BuildOptions(object): return env - def add_homebrew_package_to_env(self, package, env): + def add_homebrew_package_to_env(self, package, env) -> bool: prefix = homebrew_package_prefix(package) if prefix and os.path.exists(prefix): return self.add_prefix_to_env( @@ -472,7 +472,7 @@ def find_unused_drive_letter(): return available[-1] -def create_subst_path(path) -> str: +def create_subst_path(path: str) -> str: for _attempt in range(0, 24): drive = find_existing_win32_subst_for_path( path, subst_mapping=list_win32_subst_letters() diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 3a96f177b..574c471db 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -122,7 +122,7 @@ directory = "{vendored_dir}" return dep_to_git - def _prepare(self, install_dirs, reconfigure): + def _prepare(self, install_dirs, reconfigure) -> None: build_source_dir = self.build_source_dir() self.recreate_dir(self.src_dir, build_source_dir) diff --git a/build/fbcode_builder/getdeps/envfuncs.py b/build/fbcode_builder/getdeps/envfuncs.py index cd4664d74..a9010db32 100644 --- a/build/fbcode_builder/getdeps/envfuncs.py +++ b/build/fbcode_builder/getdeps/envfuncs.py @@ -137,7 +137,7 @@ def add_path_entry( env.set(name, separator.join(val)) -def add_flag(env, name, flag, append: bool = True) -> None: +def add_flag(env, name, flag: str, append: bool = True) -> None: """Cause `flag` to be added to the CXXFLAGS-style env var named `name` held in the `env` dict. `append` specifies whether the flag is added to the end (the default) or should be prepended if @@ -180,7 +180,7 @@ def path_search(env, exename, defval=None): return result -def _perform_path_search(path, exename): +def _perform_path_search(path, exename: str): is_win = sys.platform.startswith("win") if is_win: exename = "%s.exe" % exename diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index 7f5df4323..a42ae58b9 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -275,7 +275,7 @@ class GitFetcher(Fetcher): return ChangeStatus(True) - def update(self): + def update(self) -> ChangeStatus: if os.path.exists(self.repo_dir): return self._update() self._clone() @@ -556,7 +556,7 @@ class SimpleShipitTransformerFetcher(Fetcher): if os.path.exists(self.repo_dir): shutil.rmtree(self.repo_dir) - def update(self): + def update(self) -> ChangeStatus: mapping = ShipitPathMap() for src, dest in self.manifest.get_section_as_ordered_pairs( "shipit.pathmap", self.ctx diff --git a/build/fbcode_builder/getdeps/py_wheel_builder.py b/build/fbcode_builder/getdeps/py_wheel_builder.py index 751349135..53e807927 100644 --- a/build/fbcode_builder/getdeps/py_wheel_builder.py +++ b/build/fbcode_builder/getdeps/py_wheel_builder.py @@ -221,7 +221,7 @@ class PythonWheelBuilder(BuilderBase): def _add_sources( self, path_mapping: Dict[str, str], src_path: str, install_path: str - ): + ) -> None: s = os.lstat(src_path) if not stat.S_ISDIR(s.st_mode): path_mapping[src_path] = install_path diff --git a/build/fbcode_builder/getdeps/runcmd.py b/build/fbcode_builder/getdeps/runcmd.py index b67e5686c..618a94eea 100644 --- a/build/fbcode_builder/getdeps/runcmd.py +++ b/build/fbcode_builder/getdeps/runcmd.py @@ -44,7 +44,7 @@ def _print_env_diff(env, log_fn) -> None: log_fn("+ %s=%s \\\n" % (k, shellquote(env[k]))) -def run_cmd(cmd, env=None, cwd=None, allow_fail: bool = False, log_file=None): +def run_cmd(cmd, env=None, cwd=None, allow_fail: bool = False, log_file=None) -> int: def log_to_stdout(msg): sys.stdout.buffer.write(msg.encode(errors="surrogateescape")) diff --git a/build/fbcode_builder/shell_quoting.py b/build/fbcode_builder/shell_quoting.py index 41a41b4fe..f70611762 100644 --- a/build/fbcode_builder/shell_quoting.py +++ b/build/fbcode_builder/shell_quoting.py @@ -91,7 +91,7 @@ def path_join(*args) -> ShellQuoted: return ShellQuoted(os.path.join(*[raw_shell(shell_quote(s)) for s in args])) -def shell_comment(c): +def shell_comment(c: ShellQuoted) -> ShellQuoted: "Do not shell-escape raw strings in comments, but do handle line breaks." return ShellQuoted("# {c}").format( c=ShellQuoted(