Upgrade black to version ~=22.0 (#15565)
* Upgrade black to version ~=22.0 * Check copies * Fix code
This commit is contained in:
@@ -88,7 +88,7 @@ def find_code_in_transformers(object_name):
|
||||
line_index = 0
|
||||
for name in parts[i + 1 :]:
|
||||
while (
|
||||
line_index < len(lines) and re.search(fr"^{indent}(class|def)\s+{name}(\(|\:)", lines[line_index]) is None
|
||||
line_index < len(lines) and re.search(rf"^{indent}(class|def)\s+{name}(\(|\:)", lines[line_index]) is None
|
||||
):
|
||||
line_index += 1
|
||||
indent += " "
|
||||
@@ -130,7 +130,8 @@ def blackify(code):
|
||||
has_indent = len(get_indent(code)) > 0
|
||||
if has_indent:
|
||||
code = f"class Bla:\n{code}"
|
||||
result = black.format_str(code, mode=black.FileMode([black.TargetVersion.PY35], line_length=119))
|
||||
mode = black.Mode(target_versions={black.TargetVersion.PY35}, line_length=119)
|
||||
result = black.format_str(code, mode=mode)
|
||||
result, _ = style_docstrings_in_code(result)
|
||||
return result[len("class Bla:\n") :] if has_indent else result
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ fork_point_sha = subprocess.check_output("git merge-base master HEAD".split()).d
|
||||
modified_files = subprocess.check_output(f"git diff --name-only {fork_point_sha}".split()).decode("utf-8").split()
|
||||
|
||||
joined_dirs = "|".join(sys.argv[1:])
|
||||
regex = re.compile(fr"^({joined_dirs}).*?\.py$")
|
||||
regex = re.compile(rf"^({joined_dirs}).*?\.py$")
|
||||
|
||||
relevant_modified_files = [x for x in modified_files if regex.match(x)]
|
||||
print(" ".join(relevant_modified_files), end="")
|
||||
|
||||
@@ -147,9 +147,8 @@ def format_code_example(code: str, max_len: int, in_docstring: bool = False):
|
||||
for k, v in BLACK_AVOID_PATTERNS.items():
|
||||
full_code = full_code.replace(k, v)
|
||||
try:
|
||||
formatted_code = black.format_str(
|
||||
full_code, mode=black.FileMode([black.TargetVersion.PY37], line_length=line_length)
|
||||
)
|
||||
mode = black.Mode(target_versions={black.TargetVersion.PY37}, line_length=line_length)
|
||||
formatted_code = black.format_str(full_code, mode=mode)
|
||||
error = ""
|
||||
except Exception as e:
|
||||
formatted_code = full_code
|
||||
|
||||
Reference in New Issue
Block a user