Fix pre-commit issues, get removesuffix from str

Signed-off-by: Fabrice Normandin <[email protected]>

Author: lebrice

milatools/cli/code.py

@@ -2,9 +2,9 @@
 
 import asyncio
 import shutil
+from collections.abc import Awaitable
 from logging import getLogger as get_logger
 from pathlib import PurePosixPath
-from typing import Awaitable
 
 from milatools.cli import console
 from milatools.cli.init_command import DRAC_CLUSTERS

milatools/cli/utils.py

@@ -366,18 +366,6 @@ def stripped_lines_of(text: str) -> list[str]:
     return [line.strip() for line in text.splitlines()]
 
 
-if sys.version_info < (3, 9):
-
-    def removesuffix(s: str, suffix: str) -> str:
-        """Backport of `str.removesuffix` for Python<3.9."""
-        if s.endswith(suffix):
-            return s[: -len(suffix)]
-        else:
-            return s
-else:
-    removesuffix = str.removesuffix
-
-
 class AllocationFlagsAction(argparse._StoreAction):
     def __call__(
         self,

milatools/utils/parallel_progress.py

@@ -2,9 +2,9 @@
 
 import asyncio
 import functools
+from collections.abc import Coroutine
 from logging import getLogger as get_logger
 from typing import (
-    Coroutine,
     Protocol,
     TypedDict,
     TypeVar,

milatools/utils/vscode_utils.py

@@ -7,9 +7,9 @@
 import subprocess
 import sys
 import textwrap
+from collections.abc import Sequence
 from logging import getLogger as get_logger
 from pathlib import Path
-from typing import Sequence
 
 from milatools.cli.utils import (
     CommandNotFoundError,

tests/cli/common.py

@@ -17,7 +17,7 @@
 from pytest_regressions.file_regression import FileRegressionFixture
 from typing_extensions import ParamSpec
 
-from milatools.cli.utils import SSH_CACHE_DIR, SSH_CONFIG_FILE, removesuffix
+from milatools.cli.utils import SSH_CACHE_DIR, SSH_CONFIG_FILE
 from milatools.utils.remote_v2 import RemoteV2, get_controlpath_for
 
 if typing.TYPE_CHECKING:
@@ -208,4 +208,4 @@ def _lambda_to_str(lambda_: Callable) -> str:
     #    lambda x: x + 1,
     # ]
     # a trailing comma is returned by `inspect.getsource`, which we want to remove.
-    return removesuffix(lambda_body, ",")
+    return lambda_body.removesuffix(",")

tests/integration/test_code.py

@@ -20,7 +20,6 @@
     CommandNotFoundError,
     MilatoolsUserError,
     get_hostname_to_use_for_compute_node,
-    removesuffix,
 )
 from milatools.utils import disk_quota
 from milatools.utils.compute_node import (
@@ -324,7 +323,7 @@ async def test_code_with_existing_job(
         hostname = existing_job.hostname
         # We actually need to pass `cn-a001` (node name) as --node, not the entire
         # hostname!
-        node = removesuffix(hostname, ".server.mila.quebec")
+        node = hostname.removesuffix(".server.mila.quebec")
 
     if not use_v1:
 
@@ -368,7 +367,7 @@ def _mock_close():
             hostname = existing_job.hostname
             # We actually need to pass `cn-a001` (node name) as --node, not the entire
             # hostname!
-            node = removesuffix(hostname, ".server.mila.quebec")
+            node = hostname.removesuffix(".server.mila.quebec")
 
         code_v1(
             path=path,

tests/utils/test_compute_node.py

@@ -12,7 +12,6 @@
 import pytest
 import pytest_asyncio
 
-from milatools.cli.utils import removesuffix
 from milatools.utils.compute_node import (
     ComputeNode,
     JobNotRunningError,
@@ -251,10 +250,7 @@ async def test_connect_with_node_name(self, runner: ComputeNode):
         # squeue expects the node name, so we have to truncate it manually for now.
         login_node = runner.login_node
         node_hostname = runner.hostname
-        if node_hostname.endswith(".server.mila.quebec"):
-            node_name = removesuffix(node_hostname, ".server.mila.quebec")
-        else:
-            node_name = node_hostname
+        node_name = node_hostname.removesuffix(".server.mila.quebec")
 
         # Connect with the node name:
         compute_node_with_node_name = await ComputeNode.connect(

tests/utils/test_parallel_progress.py

@@ -10,7 +10,6 @@
 from pytest_regressions.file_regression import FileRegressionFixture
 
 from milatools.cli import console
-from milatools.cli.utils import removesuffix
 from milatools.utils.parallel_progress import (
     AsyncTaskFn,
     ReportProgressFn,
@@ -71,7 +70,7 @@ async def test_async_progress_bar(file_regression: FileRegressionFixture):
     all_output = capture.get()
     # Remove the elapsed column since its values can vary a little bit between runs.
     all_output_without_elapsed = "\n".join(
-        removesuffix(line, last_part).rstrip()
+        line.removesuffix(last_part).rstrip()
         if (parts := line.split()) and (last_part := parts[-1]).count(":") == 2
         else line
         for line in all_output.splitlines()