Merge pull request #136 from knopki/fix-shell-stuff

Fix shell stuff

Author: blokhin

examples/submit_any_engine_input.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 
-import os
 import argparse
+import os
 
 from yascheduler import Yascheduler
 
-
 parser = argparse.ArgumentParser()
 parser.add_argument("-f", dest="file", action="store", type=str, required=True)
 parser.add_argument("-e", dest="engine", action="store", type=str, required=True)

yascheduler/config/utils.py

@@ -28,4 +28,5 @@ def warn_unknown_fields(known_fields: Sequence[str], sec: SectionProxy) -> None:
         warnings.warn(
             f"Config section {sec.name} unknown fields: {', '.join(unknown_fields)}",
             ConfigWarning,
+            3,
         )

yascheduler/db.py

@@ -243,7 +243,9 @@ async def get_task_ids_by_ip_and_status(
     ) -> Sequence[int]:
         """Get task ids by ip and status"""
         rows = await self.run(
-            "SELECT task_id FROM yascheduler_tasks WHERE ip=:ip AND status=:status ORDER BY task_id;",
+            """SELECT task_id FROM yascheduler_tasks
+            WHERE ip=:ip AND status=:status
+            ORDER BY task_id;""",
             ip=ip_addr,
             status=status.value,
         )

yascheduler/remote_machine/checks.py

@@ -19,9 +19,11 @@ async def check_is_linux(conn: SSHClientConnection) -> bool:
 
 
 @lru_cache
-async def _get_os_release(conn: SSHClientConnection) -> Optional[Tuple[str, str, str]]:
+async def _get_os_release(conn: SSHClientConnection) -> Optional[Tuple[str]]:
     "Get os release string on linuxes"
-    proc = await conn.run("source /etc/os-release; echo $ID@@@$ID_LIKE@@@$VERSION_ID")
+    proc = await conn.run(
+        "sh -c 'source /etc/os-release; echo $ID@@@$ID_LIKE@@@$VERSION_ID'"
+    )
     if proc.returncode != 0 or not proc.stdout:
         return None
     return tuple(map(lambda x: x.strip(), str(proc.stdout).split("@@@", maxsplit=3)))
@@ -30,7 +32,7 @@ async def _get_os_release(conn: SSHClientConnection) -> Optional[Tuple[str, str,
 async def check_is_debian_like(conn: SSHClientConnection) -> bool:
     "Check for any Debian-like"
     os_release = await _get_os_release(conn)
-    return "debian" in [os_release[0], os_release[1]] if os_release else False
+    return "debian" in os_release[0:2] if os_release else False
 
 
 async def check_is_debian(conn: SSHClientConnection) -> bool:
@@ -42,7 +44,7 @@ async def check_is_debian(conn: SSHClientConnection) -> bool:
 async def _check_debian_version(version: str, conn: SSHClientConnection) -> bool:
     "Check for Debian version"
     os_release = await _get_os_release(conn)
-    return os_release[2] == version if os_release else False
+    return len(os_release) >= 2 and os_release[2] == version if os_release else False
 
 
 check_is_debian_10 = partial(_check_debian_version, "10")

yascheduler/utils.py

@@ -1,6 +1,7 @@
 """
 Console scripts for yascheduler
 """
+
 import argparse
 import asyncio
 import logging