apply import merging for fbcode (8 of 11)

Summary:
Applies new import merging and sorting from µsort v1.0.

When merging imports, µsort will make a best-effort to move associated
comments to match merged elements, but there are known limitations due to
the diynamic nature of Python and developer tooling. These changes should
not produce any dangerous runtime changes, but may require touch-ups to
satisfy linters and other tooling.

Note that µsort uses case-insensitive, lexicographical sorting, which
results in a different ordering compared to isort. This provides a more
consistent sorting order, matching the case-insensitive order used when
sorting import statements by module name, and ensures that "frog", "FROG",
and "Frog" always sort next to each other.

For details on µsort's sorting and merging semantics, see the user guide:
https://usort.readthedocs.io/en/stable/guide.html#sorting

Reviewed By: lisroach

Differential Revision: D36402214

fbshipit-source-id: b641bfa9d46242188524d4ae2c44998922a62b4c

Author: amyreese

build/fbcode_builder/docker_builder.py

@@ -19,7 +19,7 @@
 import tempfile
 
 from fbcode_builder import FBCodeBuilder
-from shell_quoting import raw_shell, shell_comment, shell_join, ShellQuoted, path_join
+from shell_quoting import path_join, raw_shell, shell_comment, shell_join, ShellQuoted
 from utils import recursively_flatten_list, run_command
 
 

build/fbcode_builder/getdeps.py

@@ -21,15 +21,15 @@
 from getdeps.dyndeps import create_dyn_dep_munger
 from getdeps.errors import TransientFailure
 from getdeps.fetcher import (
-    SystemPackageFetcher,
     file_name_is_cmake_file,
     list_files_under_dir_newer_than_timestamp,
+    SystemPackageFetcher,
 )
 from getdeps.load import ManifestLoader
 from getdeps.manifest import ManifestParser
 from getdeps.platform import HostType
 from getdeps.runcmd import run_cmd
-from getdeps.subcmd import SubCmd, add_subcommands, cmd
+from getdeps.subcmd import add_subcommands, cmd, SubCmd
 
 
 try:

build/fbcode_builder/getdeps/builder.py

@@ -14,7 +14,7 @@
 import sys
 
 from .dyndeps import create_dyn_dep_munger
-from .envfuncs import Env, add_path_entry, path_search
+from .envfuncs import add_path_entry, Env, path_search
 from .fetcher import copy_if_different
 from .runcmd import run_cmd
 

build/fbcode_builder/getdeps/buildopts.py

@@ -10,13 +10,13 @@
 import subprocess
 import sys
 import tempfile
-from typing import Optional, Mapping
+from typing import Mapping, Optional
 
 from .copytree import containing_repo_type
-from .envfuncs import Env, add_flag, add_path_entry
+from .envfuncs import add_flag, add_path_entry, Env
 from .fetcher import get_fbsource_repo_data, homebrew_package_prefix
 from .manifest import ContextGenerator
-from .platform import HostType, is_windows, get_available_ram
+from .platform import get_available_ram, HostType, is_windows
 
 
 def detect_project(path):

build/fbcode_builder/getdeps/manifest.py

@@ -11,6 +11,7 @@
 from .builder import (
     AutoconfBuilder,
     Boost,
+    CMakeBootStrapBuilder,
     CMakeBuilder,
     Iproute2Builder,
     MakeBuilder,
@@ -19,7 +20,6 @@
     OpenNSABuilder,
     OpenSSLBuilder,
     SqliteBuilder,
-    CMakeBootStrapBuilder,
 )
 from .cargo import CargoBuilder
 from .expr import parse_expr

build/fbcode_builder/make_docker_context.py

@@ -183,7 +183,7 @@ def add_args(parser):
 
 
 if __name__ == "__main__":
-    from utils import read_fbcode_builder_config, build_fbcode_builder_config
+    from utils import build_fbcode_builder_config, read_fbcode_builder_config
 
     # Load a spec from the current directory
     config = read_fbcode_builder_config("fbcode_builder_config.py")

build/fbcode_builder/shell_builder.py

@@ -88,7 +88,7 @@ def persistent_temp_dir(repo_root):
 
 
 if __name__ == "__main__":
-    from utils import read_fbcode_builder_config, build_fbcode_builder_config
+    from utils import build_fbcode_builder_config, read_fbcode_builder_config
 
     repo_root = find_project_root()
     temp = persistent_temp_dir(repo_root)