style: Enable Ruff SIM (simplify) rules (meltano#7447)

pyproject.toml

@@ -224,6 +224,7 @@ pyflakes = [
   "-WPS300", # Allow local folder imports (import .module)
   "-WPS305", # Allow f-strings
   "-WPS306", # Ignore missing base class, required by pyupgrade: https://github.com/asottile/pyupgrade#rewrites-class-declaration
+  "-WPS309", # Allow reversed compare order
   "-WPS316",
   "-WPS317", # Allow "incorrect multi-line parameters", since Black forces them to be "incorrect"
   "-WPS324", # Allow inconsistent returns - permitted because of too many false positives
@@ -573,6 +574,7 @@ select = [
   "I",   # isort
   "ISC", # flake8-implicit-str-concat
   "RSE", # flake8-raise
+  "SIM", # flake8-simplify
   "UP",  # pyupgrade
   "W",   # pycodestyle (warning)
 ]

src/meltano/cli/elt.py

@@ -95,7 +95,7 @@
 @click.pass_context
 @pass_project(migrate=True)
 @click_run_async
-async def elt(
+async def elt(  # WPS408
     project: Project,
     ctx: click.Context,
     extractor: str,
@@ -303,7 +303,12 @@ async def _run_elt(
             ) from err
 
 
-async def _run_extract_load(log, elt_context, output_logger, **kwargs):  # noqa: WPS231
+async def _run_extract_load(  # noqa: WPS210, WPS231
+    log,
+    elt_context,
+    output_logger,
+    **kwargs,
+):
     extractor = elt_context.extractor.name
     loader = elt_context.loader.name
 
@@ -344,7 +349,9 @@ async def _run_extract_load(log, elt_context, output_logger, **kwargs):  # noqa:
 
     singer_runner = SingerRunner(elt_context)
     try:
-        with extractor_log.line_writer() as extractor_log_writer:
+        # Once Python 3.9 support has been dropped, consolidate these
+        # with-statements by using parentheses.
+        with extractor_log.line_writer() as extractor_log_writer:  # noqa: SIM117
             with loader_log.line_writer() as loader_log_writer:
                 with extractor_out_writer_ctxmgr() as extractor_out_writer:
                     with loader_out_writer_ctxmgr() as loader_out_writer:

src/meltano/cli/invoke.py

@@ -207,7 +207,7 @@ def do_list_commands(plugin):
         f"{plugin.name}:{cmd}": props.description
         for cmd, props in plugin.all_commands.items()
     }
-    column_len = max(len(name) for name in descriptions.keys()) + 2
+    column_len = max(len(name) for name in descriptions) + 2
     for name, desc in descriptions.items():
         click.secho(name.ljust(column_len, " "), fg="blue", nl=False)
         click.echo(desc)

src/meltano/core/block/future_utils.py

@@ -12,10 +12,7 @@
 
 def all_done(tasks: list[Task], done: set[Task]) -> bool:
     """Iterate through a task list checking if ALL tasks are in the done set."""
-    for idx in tasks:
-        if idx not in done:
-            return False
-    return True
+    return all(idx in done for idx in tasks)
 
 
 def first_failed_future(exception_future: Task, done: set[Task]) -> Task | None:

src/meltano/core/block/singer.py

@@ -206,7 +206,7 @@ async def close_stdin(self) -> None:
         """Close the underlying process stdin if the block is a consumer."""
         if self.consumer:
             self.process_handle.stdin.close()
-            with suppress(AttributeError):  # `wait_closed` is Python 3.8+ (see #3347
+            with suppress(AttributeError):  # `wait_closed` is Python 3.8+ (see #3347)
                 await self.process_handle.stdin.wait_closed()
 
     def stdout_link(self, dst: SubprocessOutputWriter) -> None:
@@ -248,12 +248,10 @@ async def pre(self, context) -> None:
 
     async def post(self) -> None:
         """Post triggers resetting the underlying plugin config."""
-        try:
+        with suppress(FileNotFoundError):
+            # TODO: should we preserve these on a failure?
+            # The invoker prepared context manager was able to clean up the configs
             await self.invoker.cleanup()
-        except FileNotFoundError:
-            # TODO: should we preserve these on a failure ?
-            # the invoker prepared context manager was able to clean up the configs
-            pass
 
     def _merge_outputs(self, source: str, outputs: list) -> list:
         if not self.invoker.output_handlers:
@@ -367,8 +365,6 @@ async def stop(self, kill: bool = True):
             self._stdout_future.cancel()
         if self._stderr_future is not None:
             self._stderr_future.cancel()
-        try:
-            await self.invoker.cleanup()
-        except FileNotFoundError:
+        with suppress(FileNotFoundError):
             # the invoker prepared context manager was able to clean up the configs
-            pass
+            await self.invoker.cleanup()

src/meltano/core/plugin_discovery_service.py

@@ -233,9 +233,10 @@ def load_local_discovery(self) -> DiscoveryFile | None:
         Returns:
             The discovery file.
         """
-        with suppress(FileNotFoundError):
-            with self.project.root_dir("discovery.yml").open() as local_discovery:
-                return self.load_discovery(local_discovery)
+        with suppress(FileNotFoundError), self.project.root_dir(
+            "discovery.yml",
+        ).open() as local_discovery:
+            return self.load_discovery(local_discovery)
 
     def load_remote_discovery(self) -> DiscoveryFile | None:
         """Load the remote `discovery.yml` manifest.
@@ -285,9 +286,10 @@ def load_cached_discovery(self) -> DiscoveryFile | None:
         Returns:
             The discovery file.
         """
-        with suppress(FileNotFoundError):
-            with self.cached_discovery_file.open() as cached_discovery:
-                return self.load_discovery(cached_discovery)
+        with suppress(
+            FileNotFoundError,
+        ), self.cached_discovery_file.open() as cached_discovery:
+            return self.load_discovery(cached_discovery)
 
     def load_bundled_discovery(self):
         """Load the bundled `discovery.yml` manifest.

src/meltano/core/project_files.py

@@ -313,7 +313,7 @@ def _restore_file_key_order(self, file_dicts: dict[str, CommentedMap]):
 
             # Restore sorting in project files
             sorted_file_dicts[file] = CommentedMap()
-            for key in contents.keys():
+            for key in contents:
                 if key in file_dicts[file]:
                     sorted_file_dicts[file][key] = file_dicts[file][key]
 

src/meltano/core/state_store/azure.py

@@ -123,11 +123,8 @@ def get_state_ids(self, pattern: str | None = None):  # noqa: WPS210
             name_starts_with=self.prefix.lstrip("/"),
         ):
             (state_id, filename) = blob.name.split("/")[-2:]
-            if filename == "state.json":
-                if not pattern:
-                    state_ids.add(state_id)
-                elif pattern_re.match(state_id):
-                    state_ids.add(state_id)
+            if filename == "state.json" and (not pattern) or pattern_re.match(state_id):
+                state_ids.add(state_id)
         return list(state_ids)
 
     def delete(self, file_path: str):

src/meltano/core/state_store/filesystem.py

@@ -500,8 +500,6 @@ def get_state_ids(self, pattern: str | None = None):
             state_id = b64decode(
                 os.path.basename(os.path.dirname(state_file)).encode(),
             ).decode()
-            if not pattern:
-                state_ids.add(state_id)
-            elif pattern_re.match(state_id):
+            if (not pattern) or pattern_re.match(state_id):
                 state_ids.add(state_id)
         return state_ids

src/meltano/core/state_store/google.py

@@ -122,11 +122,8 @@ def get_state_ids(self, pattern: str | None = None):  # noqa: WPS210
         state_ids = set()
         for blob in self.client.list_blobs(bucket_or_name=self.bucket):
             (state_id, filename) = blob.name.split("/")[-2:]
-            if filename == "state.json":
-                if not pattern:
-                    state_ids.add(state_id)
-                elif pattern_re.match(state_id):
-                    state_ids.add(state_id)
+            if filename == "state.json" and (not pattern) or pattern_re.match(state_id):
+                state_ids.add(state_id)
         return list(state_ids)
 
     def delete(self, file_path: str):

src/meltano/core/validation_service.py

@@ -89,7 +89,7 @@ def select_test(self, name: str) -> None:
 
     def select_all(self) -> None:
         """Mark all plugin validators as selected."""
-        for name in self.tests_selection.keys():
+        for name in self.tests_selection:
             self.tests_selection[name] = True
 
     async def run_all(self, session: sessionmaker) -> dict[str, int]:

tests/fixtures/core.py

@@ -454,16 +454,16 @@ def project_directory(project_init_service):
 
 @pytest.fixture(scope="class")
 def project(project_init_service, tmp_path_factory: pytest.TempPathFactory):
-    with cd(tmp_path_factory.mktemp("meltano-project-dir")):
-        with project_directory(project_init_service) as project:
-            yield project
+    with cd(tmp_path_factory.mktemp("meltano-project-dir")), project_directory(
+        project_init_service,
+    ) as project:
+        yield project
 
 
 @pytest.fixture(scope="function")
 def project_function(project_init_service, tmp_path: Path):
-    with cd(tmp_path):
-        with project_directory(project_init_service) as project:
-            yield project
+    with cd(tmp_path), project_directory(project_init_service) as project:
+        yield project
 
 
 @pytest.fixture(scope="class")

tests/meltano/api/controllers/test_settings.py

@@ -81,12 +81,11 @@ def test_assign_role(self, user, status_code, api, app, impersonate):
         ],
     )
     def test_delete_admin_role(self, user, status_code, api, app, impersonate):
-        with app.test_request_context():
-            with impersonate(users.get_user(user)):
-                res = api.delete(
-                    url_for("settings.roles"),
-                    json={"role": {"name": "admin"}},
-                )
+        with app.test_request_context(), impersonate(users.get_user(user)):
+            res = api.delete(
+                url_for("settings.roles"),
+                json={"role": {"name": "admin"}},
+            )
 
         assert res.status_code == status_code, res.data