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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 58ce406b1c8d497f818e0d56647f40217fb58d81..cb8c534c9ac936069f11d92738cd475ce51efbfb 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,10 +10,10 @@ jobs:
         python-version: [3.7]
 
     steps:
         python-version: [3.7]
 
     steps:

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

 
       - name: Set up Python ${{ matrix.python-version }}
 
       - name: Set up Python ${{ matrix.python-version }}

-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2

         with:
           python-version: ${{ matrix.python-version }}
 
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c2671daa15364d53ed9698c5034582b745d67fad..bd0af61e7f5321e66f4e0e69569b203fc1cd287f 100644 (file)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,10 +12,10 @@ jobs:
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:

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

 
       - name: Set up Python ${{ matrix.python-version }}
 
       - name: Set up Python ${{ matrix.python-version }}

-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2

         with:
           python-version: ${{ matrix.python-version }}
 
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bbd034dc0c21f61b667e9051ffbf6bc22abbc71b..667b22d6328f1d3581aeaf4d59a64092c75978ca 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,13 +12,13 @@ repos:
         types: [python]
 
   - repo: https://gitlab.com/pycqa/flake8
         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
     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
     hooks:
       - id: mypy
         exclude: ^docs/conf.py

diff --git a/src/black/__init__.py b/src/black/__init__.py
index 77dda2b52cc4bbebc3a57f4ed272f42071d45cfe..f666a1f2e4f7d87096aca18b774a18a02437d170 100644 (file)
--- a/src/black/__init__.py
+++ b/src/black/__init__.py
@@ -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 = 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] = {}
         )
 
     default_map: Dict[str, Any] = {}


@@ -1633,8 +1633,10 @@ class Line:
         # one line in the original code.
 
         # Grab the first and last line numbers, skipping generated leaves
         # 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
 
         if first_line == last_line:
             # We look at the last two leaves since a comma or an


@@ -2710,15 +2712,15 @@ def transform_line(
         # split altogether.
         result: List[Line] = []
         try:
         # 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(
                     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,
                         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 == "("
             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:
             )
 
             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]:
 
     @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
 
 
     return split_wrapper
 

diff --git a/src/black_primer/cli.py b/src/black_primer/cli.py
index 010ea6c7af2e26ec5c23c609760bada411db6e23..f7d3321a9ea44e7631f8f44d66007fcf7a9e476e 100644 (file)
--- a/src/black_primer/cli.py
+++ b/src/black_primer/cli.py
@@ -50,7 +50,7 @@ async def async_main(
         work_path.mkdir()
 
     if not which("black"):
         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:
         return -1
 
     try:

diff --git a/src/black_primer/lib.py b/src/black_primer/lib.py
index 87028d72509ac5777ad75fd6d9aec3453eadadb8..be0618ca5b2f53d3fe5c12a5f9ef51256951a14e 100644 (file)
--- a/src/black_primer/lib.py
+++ b/src/black_primer/lib.py
@@ -57,7 +57,7 @@ async def analyze_results(project_count: int, results: Results) -> int:
     failed_pct = round(((results.stats["failed"] / project_count) * 100), 2)
     success_pct = round(((results.stats["success"] / project_count) * 100), 2)
 
     failed_pct = round(((results.stats["failed"] / project_count) * 100), 2)
     success_pct = round(((results.stats["success"] / project_count) * 100), 2)
 

-    click.secho(f"-- primer results 📊 --\n", bold=True)
+    click.secho("-- primer results 📊 --\n", bold=True)

     click.secho(
         f"{results.stats['success']} / {project_count} succeeded ({success_pct}%) ✅",
         bold=True,
     click.secho(
         f"{results.stats['success']} / {project_count} succeeded ({success_pct}%) ✅",
         bold=True,


@@ -77,7 +77,7 @@ async def analyze_results(project_count: int, results: Results) -> int:
     )
 
     if results.failed_projects:
     )
 
     if results.failed_projects:

-        click.secho(f"\nFailed Projects:\n", bold=True)
+        click.secho("\nFailed Projects:\n", bold=True)

 
     for project_name, project_cpe in results.failed_projects.items():
         print(f"## {project_name}:")
 
     for project_name, project_cpe in results.failed_projects.items():
         print(f"## {project_name}:")


@@ -125,7 +125,7 @@ async def git_checkout_or_rebase(
     """git Clone project or rebase"""
     git_bin = str(which("git"))
     if not git_bin:
     """git Clone project or rebase"""
     git_bin = str(which("git"))
     if not git_bin:

-        LOG.error(f"No git binary found")
+        LOG.error("No git binary found")

         return None
 
     repo_url_parts = urlparse(project_config["git_clone_url"])
         return None
 
     repo_url_parts = urlparse(project_config["git_clone_url"])

diff --git a/tests/test_black.py b/tests/test_black.py
index 1b574c012edfcd963535c349af271d2e06299959..cb765aff227fba6de25a2304a81e9cbd538c7d28 100644 (file)
--- a/tests/test_black.py
+++ b/tests/test_black.py
@@ -252,8 +252,8 @@ class BlackTestCase(unittest.TestCase):
 
     def test_piping_diff(self) -> None:
         diff_header = re.compile(
 
     def test_piping_diff(self) -> None:
         diff_header = re.compile(

-            rf"(STDIN|STDOUT)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d "
-            rf"\+\d\d\d\d"
+            r"(STDIN|STDOUT)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d "
+            r"\+\d\d\d\d"

         )
         source, _ = read_data("expression.py")
         expected, _ = read_data("expression.diff")
         )
         source, _ = read_data("expression.py")
         expected, _ = read_data("expression.diff")


@@ -1848,7 +1848,7 @@ class BlackDTestCase(AioHTTPTestCase):
     @unittest_run_loop
     async def test_blackd_diff(self) -> None:
         diff_header = re.compile(
     @unittest_run_loop
     async def test_blackd_diff(self) -> None:
         diff_header = re.compile(

-            rf"(In|Out)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d"
+            r"(In|Out)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d"

         )
 
         source, _ = read_data("blackd_diff.py")
         )
 
         source, _ = read_data("blackd_diff.py")