fix: codacity suggestions

Author: germa89

src/ansys/mapdl/core/launcher/console.py

@@ -22,6 +22,8 @@
 
 from typing import Optional, Union
 
+from ansys.mapdl.core import LOG
+from ansys.mapdl.core.launcher.local import processing_local_arguments
 from ansys.mapdl.core.launcher.tools import generate_start_parameters
 from ansys.mapdl.core.licensing import LicenseChecker
 from ansys.mapdl.core.mapdl_console import MapdlConsole

src/ansys/mapdl/core/launcher/grpc.py

@@ -30,6 +30,8 @@
 from ansys.mapdl.core import LOG
 from ansys.mapdl.core.launcher.local import processing_local_arguments
 from ansys.mapdl.core.launcher.tools import (
+    check_mapdl_launch,
+    generate_mapdl_launch_command,
     generate_start_parameters,
     get_port,
     submitter,
@@ -88,8 +90,6 @@ def launch_mapdl_grpc():
         except Exception as exception:
             LOG.error("An error occurred when launching MAPDL.")
 
-            jobid: int = start_parm.get("jobid", "Not found")
-
             if args["license_server_check"]:
                 LOG.debug("Checking license server.")
                 lic_check.check()

src/ansys/mapdl/core/launcher/hpc.py

@@ -22,14 +22,20 @@
 
 import os
 import socket
-import subprocess
+import subprocess  # nosec B404
 import time
 from typing import Any, Callable, Dict, List, Optional, Union
 
 from ansys.mapdl.core import LOG
 from ansys.mapdl.core.errors import MapdlDidNotStart
 from ansys.mapdl.core.launcher.grpc import launch_grpc
-from ansys.mapdl.core.launcher.tools import submitter
+from ansys.mapdl.core.launcher.local import processing_local_arguments
+from ansys.mapdl.core.launcher.tools import (
+    generate_start_parameters,
+    get_port,
+    submitter,
+)
+from ansys.mapdl.core.licensing import LicenseChecker
 from ansys.mapdl.core.mapdl_grpc import MapdlGrpc
 
 LAUNCH_ON_HCP_ERROR_MESSAGE_IP = (
@@ -328,7 +334,7 @@ def launch_mapdl_on_cluster(
     )
 
 
-def launch_mapdl_grpc():
+def launch_mapdl_grpc():  # to be fixed
     args = processing_local_arguments(locals())
     if args.get("mode", "grpc") != "grpc":
         raise ValueError("Invalid 'mode'.")

src/ansys/mapdl/core/launcher/local.py

@@ -21,6 +21,8 @@
 # SOFTWARE.
 
 """Launch MAPDL locally"""
+
+from ansys.mapdl.core import LOG
 from ansys.mapdl.core.launcher.tools import (
     check_kwargs,
     check_lock_file,
@@ -72,9 +74,7 @@ def processing_local_arguments(args):
         args["license_type"], args["additional_switches"]
     )
 
-    env_vars: Dict[str, str] = update_env_vars(
-        args["add_env_vars"], args["replace_env_vars"]
-    )
+    args["env_vars"] = update_env_vars(args["add_env_vars"], args["replace_env_vars"])
 
     get_run_location(args)
 
@@ -91,7 +91,7 @@ def processing_local_arguments(args):
     # ON HPC:
     # Assuming that if login node is ubuntu, the computation ones
     # are also ubuntu.
-    env_vars = configure_ubuntu(env_vars)
+    args["env_vars"] = configure_ubuntu(args["env_vars"])
 
     # Set SMP by default if student version is used.
     args["additional_switches"] = force_smp_in_student(
@@ -108,7 +108,7 @@ def processing_local_arguments(args):
     LOG.debug(f"Using additional switches {args['additional_switches']}.")
 
     if args["running_on_hpc"] or args["launch_on_hpc"]:
-        env_vars.setdefault("ANS_MULTIPLE_NODES", "1")
-        env_vars.setdefault("HYDRA_BOOTSTRAP", "slurm")
+        args["env_vars"].setdefault("ANS_MULTIPLE_NODES", "1")
+        args["env_vars"].setdefault("HYDRA_BOOTSTRAP", "slurm")
 
     return args

src/ansys/mapdl/core/launcher/remote.py

@@ -22,6 +22,7 @@
 
 from typing import Any, Dict, Optional, Union
 
+from ansys.mapdl.core import LOG
 from ansys.mapdl.core.launcher.tools import (
     check_kwargs,
     generate_start_parameters,

src/ansys/mapdl/core/launcher/tools.py

@@ -25,7 +25,7 @@
 from queue import Empty, Queue
 import re
 import socket
-import subprocess
+import subprocess  # nosec B404
 import threading
 import time
 from typing import Any, Dict, List, Optional, Tuple, Union
@@ -450,6 +450,8 @@ def create_gallery_instances(
     # launch an instance of pymapdl if it does not already exist and
     # we're allowed to start instances
     if GALLERY_INSTANCE[0] is None:
+        from ansys.mapdl.core.launcher import launch_mapdl
+
         LOG.debug("Loading first MAPDL instance for gallery building.")
         GALLERY_INSTANCE[0] = "Loading..."
         mapdl = launch_mapdl(
@@ -832,7 +834,7 @@ def check_mapdl_launch(
         MAPDL did not start.
     """
     LOG.debug("Generating queue object for stdout")
-    stdout_queue, thread = _create_queue_for_std(process.stdout)
+    stdout_queue, _ = _create_queue_for_std(process.stdout)
 
     # Checking connection
     try:

tests/common.py

@@ -23,7 +23,7 @@
 """Shared testing module"""
 from collections import namedtuple
 import os
-import subprocess
+import subprocess  # nosec B404
 import time
 from typing import Dict, List
 

tests/test_cli.py

@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 import re
-import subprocess
+import subprocess  # nosec B404
 
 import psutil
 import pytest

tests/test_launcher.py

@@ -23,7 +23,7 @@
 """Test the mapdl launcher"""
 
 import os
-import subprocess
+import subprocess  # nosec B404
 import tempfile
 from time import sleep
 from unittest.mock import patch
@@ -1738,7 +1738,7 @@ def fake_proc(*args, **kwargs):
             time_to_stop,
         )
 
-    with patch("ansys.mapdl.core.launcher.hpc.send_scontrol", fake_proc) as mck_sc:
+    with patch("ansys.mapdl.core.launcher.hpc.send_scontrol", fake_proc):
 
         if raises:
             context = pytest.raises(raises)
@@ -2045,7 +2045,7 @@ def submitter(*args, **kwargs):
 
         return
 
-    with patch("ansys.mapdl.core.launcher.tools.submitter", submitter) as mck_sub:
+    with patch("ansys.mapdl.core.launcher.tools.submitter", submitter):
         mapdl_output = os.path.join(tmpdir, "apdl.txt")
         args = launch_mapdl(just_launch=True, mapdl_output=mapdl_output)