Unverified Commit 03b8304a authored by Hugo van Kemenade's avatar Hugo van Kemenade Committed by GitHub
Browse files

Update and fix Flake8 (#1424)

* Update pre-commit

* Fix F541 f-string is missing placeholders

* Fix E741 ambiguous variable name 'l'

* Update actions to v2
parent 435dc7d9
Loading
Loading
Loading
Loading
+2 −2
Changes for .github/workflows/lint.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ jobs:
        python-version: [3.7]

    steps:
      - uses: actions/checkout@v1
      - uses: actions/checkout@v2

      - name: Set up Python ${{ matrix.python-version }}
        uses: actions/setup-python@v1
        uses: actions/setup-python@v2
        with:
          python-version: ${{ matrix.python-version }}

+2 −2
Changes for .github/workflows/test.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ jobs:
        os: [ubuntu-latest, macOS-latest, windows-latest]

    steps:
      - uses: actions/checkout@v1
      - uses: actions/checkout@v2

      - name: Set up Python ${{ matrix.python-version }}
        uses: actions/setup-python@v1
        uses: actions/setup-python@v2
        with:
          python-version: ${{ matrix.python-version }}

+2 −2
Changes for .pre-commit-config.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ repos:
        types: [python]

  - repo: https://gitlab.com/pycqa/flake8
    rev: 3.7.9
    rev: 3.8.1
    hooks:
      - id: flake8
        additional_dependencies: [flake8-bugbear]

  - repo: https://github.com/pre-commit/mirrors-mypy
    rev: v0.761
    rev: v0.770
    hooks:
      - id: mypy
        exclude: ^docs/conf.py
+12 −10
Changes for src/black/__init__.py: 12 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ def read_pyproject_toml(
    target_version = config.get("target_version")
    if target_version is not None and not isinstance(target_version, list):
        raise click.BadOptionUsage(
            "target-version", f"Config key target-version must be a list"
            "target-version", "Config key target-version must be a list"
        )

    default_map: Dict[str, Any] = {}
@@ -1633,8 +1633,10 @@ def contains_unsplittable_type_ignore(self) -> bool:
        # one line in the original code.

        # Grab the first and last line numbers, skipping generated leaves
        first_line = next((l.lineno for l in self.leaves if l.lineno != 0), 0)
        last_line = next((l.lineno for l in reversed(self.leaves) if l.lineno != 0), 0)
        first_line = next((leaf.lineno for leaf in self.leaves if leaf.lineno != 0), 0)
        last_line = next(
            (leaf.lineno for leaf in reversed(self.leaves) if leaf.lineno != 0), 0
        )

        if first_line == last_line:
            # We look at the last two leaves since a comma or an
@@ -2710,15 +2712,15 @@ def rhs(line: Line, features: Collection[Feature]) -> Iterator[Line]:
        # split altogether.
        result: List[Line] = []
        try:
            for l in transform(line, features):
                if str(l).strip("\n") == line_str:
            for transformed_line in transform(line, features):
                if str(transformed_line).strip("\n") == line_str:
                    raise CannotTransform(
                        "Line transformer returned an unchanged result"
                    )

                result.extend(
                    transform_line(
                        l,
                        transformed_line,
                        line_length=line_length,
                        normalize_strings=normalize_strings,
                        features=features,
@@ -4836,7 +4838,7 @@ def bracket_split_build_line(
            no_commas = (
                original.is_def
                and opening_bracket.value == "("
                and not any(l.type == token.COMMA for l in leaves)
                and not any(leaf.type == token.COMMA for leaf in leaves)
            )

            if original.is_import or no_commas:
@@ -4866,9 +4868,9 @@ def dont_increase_indentation(split_func: Transformer) -> Transformer:

    @wraps(split_func)
    def split_wrapper(line: Line, features: Collection[Feature] = ()) -> Iterator[Line]:
        for l in split_func(line, features):
            normalize_prefix(l.leaves[0], inside_brackets=True)
            yield l
        for line in split_func(line, features):
            normalize_prefix(line.leaves[0], inside_brackets=True)
            yield line

    return split_wrapper

+1 −1
Changes for src/black_primer/cli.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ async def async_main(
        work_path.mkdir()

    if not which("black"):
        LOG.error(f"Can not find 'black' executable in PATH. No point in running")
        LOG.error("Can not find 'black' executable in PATH. No point in running")
        return -1

    try:
Loading