This commit is contained in:
Kevin Kirsche 2020-05-21 09:44:43 -04:00 committed by GitHub
parent a2408b3cb2
commit f3599b22d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions

View File

@ -25,7 +25,7 @@ line_length = 88
### Why those options above? ### Why those options above?
_Black_ wraps imports that surpass `line-length` by moving identifiers into their own _Black_ wraps imports that surpass `line-length` by moving identifiers into their own
indented line. If that still doesn't fit the bill, it will put all of them in seperate indented line. If that still doesn't fit the bill, it will put all of them in separate
lines and put a trailing comma. A more detailed explanation of this behaviour can be lines and put a trailing comma. A more detailed explanation of this behaviour can be
[found here](https://github.com/psf/black#how-black-wraps-lines). [found here](https://github.com/psf/black#how-black-wraps-lines).

View File

@ -138,7 +138,7 @@ def download_and_extract_top_packages(
def git_create_repository(repo: Path) -> None: def git_create_repository(repo: Path) -> None:
subprocess.run(["git", "init"], cwd=repo) subprocess.run(["git", "init"], cwd=repo)
git_add_and_commit(msg="Inital commit", repo=repo) git_add_and_commit(msg="Initial commit", repo=repo)
def git_add_and_commit(msg: str, repo: Path) -> None: def git_add_and_commit(msg: str, repo: Path) -> None:

View File

@ -2754,7 +2754,7 @@ class StringTransformer(ABC):
StringTransformer to be applied? StringTransformer to be applied?
Transformations: Transformations:
If the given Line meets all of the above requirments, which string If the given Line meets all of the above requirements, which string
transformations can you expect to be applied to it by this transformations can you expect to be applied to it by this
StringTransformer? StringTransformer?
@ -3613,7 +3613,7 @@ def do_transform(self, line: Line, string_idx: int) -> Iterator[TResult[Line]]:
# We MAY choose to drop the 'f' prefix from substrings that don't # We MAY choose to drop the 'f' prefix from substrings that don't
# contain any f-expressions, but ONLY if the original f-string # contain any f-expressions, but ONLY if the original f-string
# containes at least one f-expression. Otherwise, we will alter the AST # contains at least one f-expression. Otherwise, we will alter the AST
# of the program. # of the program.
drop_pointless_f_prefix = ("f" in prefix) and re.search( drop_pointless_f_prefix = ("f" in prefix) and re.search(
self.RE_FEXPR, LL[string_idx].value, re.VERBOSE self.RE_FEXPR, LL[string_idx].value, re.VERBOSE
@ -3703,7 +3703,7 @@ def more_splits_should_be_made() -> bool:
max_bidx = max_break_idx - 2 if line_needs_plus() else max_break_idx max_bidx = max_break_idx - 2 if line_needs_plus() else max_break_idx
maybe_break_idx = self.__get_break_idx(rest_value, max_bidx) maybe_break_idx = self.__get_break_idx(rest_value, max_bidx)
if maybe_break_idx is None: if maybe_break_idx is None:
# If we are unable to algorthmically determine a good split # If we are unable to algorithmically determine a good split
# and this string has custom splits registered to it, we # and this string has custom splits registered to it, we
# fall back to using them--which means we have to start # fall back to using them--which means we have to start
# over from the beginning. # over from the beginning.
@ -4280,7 +4280,7 @@ def do_transform(self, line: Line, string_idx: int) -> Iterator[TResult[Line]]:
class StringParser: class StringParser:
""" """
A state machine that aids in parsing a string's "trailer", which can be A state machine that aids in parsing a string's "trailer", which can be
either non-existant, an old-style formatting sequence (e.g. `% varX` or `% either non-existent, an old-style formatting sequence (e.g. `% varX` or `%
(varX, varY)`), or a method-call / attribute access (e.g. `.format(varX, (varX, varY)`), or a method-call / attribute access (e.g. `.format(varX,
varY)`). varY)`).
@ -4374,7 +4374,7 @@ def _next_state(self, leaf: Leaf) -> bool:
was directly after the string leaf in question (e.g. if our target was directly after the string leaf in question (e.g. if our target
string is `line.leaves[i]` then the first call to this method must string is `line.leaves[i]` then the first call to this method must
be `line.leaves[i + 1]`). be `line.leaves[i + 1]`).
* On the next call to this function, the leaf paramater passed in * On the next call to this function, the leaf parameter passed in
MUST be the leaf directly following @leaf. MUST be the leaf directly following @leaf.
Returns: Returns:
@ -4579,7 +4579,7 @@ def append_leaves(new_line: Line, old_line: Line, leaves: List[Leaf]) -> None:
All of the leaves in @leaves are duplicated. The duplicates are then All of the leaves in @leaves are duplicated. The duplicates are then
appended to @new_line and used to replace their originals in the underlying appended to @new_line and used to replace their originals in the underlying
Node structure. Any comments attatched to the old leaves are reattached to Node structure. Any comments attached to the old leaves are reattached to
the new leaves. the new leaves.
Pre-conditions: Pre-conditions:

View File

@ -119,7 +119,7 @@ async def black_run(
LOG.error(f"Running black for {repo_path} timed out ({cmd})") LOG.error(f"Running black for {repo_path} timed out ({cmd})")
except CalledProcessError as cpe: except CalledProcessError as cpe:
# TODO: Tune for smarter for higher signal # TODO: Tune for smarter for higher signal
# If any other reutrn value than 1 we raise - can disable project in config # If any other return value than 1 we raise - can disable project in config
if cpe.returncode == 1: if cpe.returncode == 1:
if not project_config["expect_formatting_changes"]: if not project_config["expect_formatting_changes"]:
results.stats["failed"] += 1 results.stats["failed"] += 1
@ -128,7 +128,7 @@ async def black_run(
results.stats["success"] += 1 results.stats["success"] += 1
return return
LOG.error(f"Unkown error with {repo_path}") LOG.error(f"Unknown error with {repo_path}")
raise raise
# If we get here and expect formatting changes something is up # If we get here and expect formatting changes something is up