Upgrade pre-commit tooling (#247)

Co-authored-by: Alexander Streed <[email protected]>

Author: zanieb

Diff for: .pre-commit-config.yaml

@@ -5,15 +5,15 @@ repos:
       - id: isort
         language_version: python3
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
       - id: black
         language_version: python3
         args: [
           '--preview'
         ]
   - repo: https://github.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 6.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/econchick/interrogate
@@ -23,7 +23,7 @@ repos:
         args: [-vv]
         pass_filenames: false
   - repo: https://github.com/fsouza/autoflake8
-    rev: v0.3.2
+    rev: v0.4.0
     hooks:
       - id: autoflake8
         language_version: python3

Diff for: docs/gen_blocks_catalog.py

@@ -35,9 +35,7 @@ def insert_blocks_catalog(generated_file):
     module_blocks = find_module_blocks()
     if len(module_blocks) == 0:
         return
-    generated_file.write(
-        dedent(
-            f"""
+    generated_file.write(dedent(f"""
             Below is a list of Blocks available for registration in
             `prefect-aws`.
 
@@ -49,9 +47,7 @@ def insert_blocks_catalog(generated_file):
             ```bash
             prefect block register -m {COLLECTION_SLUG}
             ```
-            """  # noqa
-        )
-    )
+            """))  # noqa
     generated_file.write(
         "Note, to use the `load` method on Blocks, you must already have a block document "  # noqa
         "[saved through code](https://docs.prefect.io/concepts/blocks/#saving-blocks) "  # noqa
@@ -74,9 +70,7 @@ def insert_blocks_catalog(generated_file):
             generated_file.write(
                 f"[{block_name}][{module_path}.{block_name}]\n\n{block_description}\n\n"
             )
-            generated_file.write(
-                dedent(
-                    f"""
+            generated_file.write(dedent(f"""
                     To load the {block_name}:
                     ```python
                     from prefect import flow
@@ -88,9 +82,7 @@ def my_flow():
 
                     my_flow()
                     ```
-                    """
-                )
-            )
+                    """))
         generated_file.write(
             f"For additional examples, check out the [{module_title} Module]"
             f"(../examples_catalog/#{module_nesting[-1]}-module) "

Diff for: docs/gen_examples_catalog.py

@@ -99,15 +99,11 @@ def get_code_examples(obj: Union[ModuleType, Callable]) -> Set[str]:
 
 examples_catalog_path = Path("examples_catalog.md")
 with mkdocs_gen_files.open(examples_catalog_path, "w") as generated_file:
-    generated_file.write(
-        dedent(
-            """
+    generated_file.write(dedent("""
             # Examples Catalog
 
             Below is a list of examples for `prefect-aws`.
-            """
-        )
-    )
+            """))
     for module_name, code_examples in code_examples_grouping.items():
         if len(code_examples) == 0:
             continue

Diff for: prefect_aws/client_parameters.py

@@ -85,8 +85,10 @@ def deprecated_verify_cert_path(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         # so the UI looks nicer
         if verify is not None and not isinstance(verify, bool):
             warnings.warn(
-                "verify should be a boolean. "
-                "If you want to use a CA cert bundle, use verify_cert_path instead.",
+                (
+                    "verify should be a boolean. "
+                    "If you want to use a CA cert bundle, use verify_cert_path instead."
+                ),
                 DeprecationWarning,
             )
         return values

Diff for: prefect_aws/ecs.py

@@ -392,15 +392,15 @@ class ECSTask(Infrastructure):
     )
 
     # Task run settings
-    launch_type: Optional[
-        Literal["FARGATE", "EC2", "EXTERNAL", "FARGATE_SPOT"]
-    ] = Field(
-        default="FARGATE",
-        description=(
-            "The type of ECS task run infrastructure that should be used. Note that"
-            " 'FARGATE_SPOT' is not a formal ECS launch type, but we will configure"
-            " the proper capacity provider stategy if set here."
-        ),
+    launch_type: Optional[Literal["FARGATE", "EC2", "EXTERNAL", "FARGATE_SPOT"]] = (
+        Field(
+            default="FARGATE",
+            description=(
+                "The type of ECS task run infrastructure that should be used. Note that"
+                " 'FARGATE_SPOT' is not a formal ECS launch type, but we will configure"
+                " the proper capacity provider stategy if set here."
+            ),
+        )
     )
     vpc_id: Optional[str] = Field(
         title="VPC ID",
@@ -1182,8 +1182,10 @@ def _stream_available_logs(
                 response = logs_client.get_log_events(**request)
             except Exception:
                 self.logger.error(
-                    f"{self._log_prefix}: Failed to read log events with request "
-                    f"{request}",
+                    (
+                        f"{self._log_prefix}: Failed to read log events with request "
+                        f"{request}"
+                    ),
                     exc_info=True,
                 )
                 return last_log_timestamp

Diff for: prefect_aws/secrets_manager.py

@@ -332,9 +332,9 @@ def example_delete_secret_with_recovery_window():
 
     delete_secret_kwargs: Dict[str, Union[str, int, bool]] = dict(SecretId=secret_name)
     if force_delete_without_recovery:
-        delete_secret_kwargs[
-            "ForceDeleteWithoutRecovery"
-        ] = force_delete_without_recovery
+        delete_secret_kwargs["ForceDeleteWithoutRecovery"] = (
+            force_delete_without_recovery
+        )
     else:
         delete_secret_kwargs["RecoveryWindowInDays"] = recovery_window_in_days
 

Diff for: prefect_aws/workers/ecs_worker.py

@@ -361,15 +361,15 @@ class ECSVariables(BaseVariables):
             "field will be slugified to match AWS character requirements."
         ),
     )
-    launch_type: Optional[
-        Literal["FARGATE", "EC2", "EXTERNAL", "FARGATE_SPOT"]
-    ] = Field(
-        default=ECS_DEFAULT_LAUNCH_TYPE,
-        description=(
-            "The type of ECS task run infrastructure that should be used. Note that"
-            " 'FARGATE_SPOT' is not a formal ECS launch type, but we will configure"
-            " the proper capacity provider stategy if set here."
-        ),
+    launch_type: Optional[Literal["FARGATE", "EC2", "EXTERNAL", "FARGATE_SPOT"]] = (
+        Field(
+            default=ECS_DEFAULT_LAUNCH_TYPE,
+            description=(
+                "The type of ECS task run infrastructure that should be used. Note that"
+                " 'FARGATE_SPOT' is not a formal ECS launch type, but we will configure"
+                " the proper capacity provider stategy if set here."
+            ),
+        )
     )
     image: Optional[str] = Field(
         default=None,

Diff for: tests/projects/test_steps.py

@@ -27,12 +27,10 @@ def tmp_files(tmp_path: Path):
         "testdir2/testfile5.txt",
     ]
 
-    (tmp_path / ".prefectignore").write_text(
-        """
+    (tmp_path / ".prefectignore").write_text("""
     testdir1/*
     .prefectignore
-    """
-    )
+    """)
 
     for file in files:
         filepath = tmp_path / file
@@ -206,14 +204,12 @@ def test_prefectignore_with_comments_and_empty_lines(
     folder = "my-project"
 
     # Update the .prefectignore file with comments and empty lines
-    (tmp_files / ".prefectignore").write_text(
-        """
+    (tmp_files / ".prefectignore").write_text("""
         # This is a comment
         testdir1/*
 
         .prefectignore
-        """
-    )
+        """)
 
     os.chdir(tmp_files)
 

Diff for: tests/test_ecs.py

@@ -1506,12 +1506,10 @@ async def test_task_definition_arn_with_overrides_requiring_copy_shows_diff(
 
     assert "Enable DEBUG level logs to see the difference." not in caplog.text
 
-    expected_diff = textwrap.dedent(
-        """
+    expected_diff = textwrap.dedent("""
         -                            'image': 'prefecthq/prefect:2.1.0-python3.8',
         +                            'image': 'foobar',
-        """
-    )
+        """)
     assert expected_diff in caplog.text
 
 
@@ -1549,7 +1547,9 @@ async def test_task_definition_arn_with_overrides_that_do_not_require_copy(
         create_test_ecs_cluster(ecs_client, overrides["cluster"])
         add_ec2_instance_to_ecs_cluster(session, overrides["cluster"])
 
-    task_definition_arn = ecs_client.register_task_definition(**BASE_TASK_DEFINITION,)[
+    task_definition_arn = ecs_client.register_task_definition(
+        **BASE_TASK_DEFINITION,
+    )[
         "taskDefinition"
     ]["taskDefinitionArn"]
 

Diff for: versioneer.py

@@ -421,9 +421,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
     return stdout, process.returncode
 
 
-LONG_VERSION_PY[
-    "git"
-] = r'''
+LONG_VERSION_PY["git"] = r'''
 # This file helps to compute a version number in source trees obtained from
 # git-archive tarball (such as those provided by githubs download-from-tag
 # feature). Distribution tarballs (built by setup.py sdist) and build