Merge branch 'main' into dependabot/pip/grpc-deps-46d428a94c

.ci/build_matrix.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# **** REMEMBER *****
+# Remember to update the env var ``LATEST_VERSION`` in ci.yml
+#
+
 # List of versions
 versions=(
     # if added more "latest", change "$LATEST"

.github/workflows/ci.yml

@@ -24,13 +24,14 @@ env:
   PACKAGE_NAME: 'ansys-mapdl-core'
   PACKAGE_NAMESPACE: 'ansys.mapdl.core'
   DOCUMENTATION_CNAME: 'mapdl.docs.pyansys.com'
+  LATEST_VERSION: "242"
+  MAPDL_IMAGE_VERSION_DOCS_BUILD: v24.2-ubuntu-student
   MEILISEARCH_API_KEY: ${{ secrets.MEILISEARCH_API_KEY }}
   MEILISEARCH_PUBLIC_API_KEY: ${{ secrets.MEILISEARCH_PUBLIC_API_KEY }}
   PYANSYS_OFF_SCREEN: True
   DPF_START_SERVER: False
   DPF_PORT: 21004
   MAPDL_PACKAGE: ghcr.io/ansys/mapdl
-  MAPDL_IMAGE_VERSION_DOCS_BUILD: v24.1-ubuntu-student
   ON_CI: True
   PYTEST_ARGUMENTS: '-vvv -ra --durations=10 --maxfail=3 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html'
 
@@ -807,7 +808,7 @@ jobs:
           # executable path with the env var: PYMAPDL_MAPDL_EXEC.
 
           if [[ "${{ matrix.mapdl-version }}" == *"latest-ubuntu"* ]] ; then
-            version="242"
+            version=${{ env.LATEST_VERSION }}
           else
             version=$(echo "${{ matrix.mapdl-version }}" | head -c 5 | tail -c 4 | tr -d '.')
           fi;

doc/changelog.d/3261.changed.md

@@ -0,0 +1 @@
+build: bump zipp from 3.17.0 to 3.19.1 in /doc/source/examples/extended_examples/hpc

doc/changelog.d/3266.fixed.md

@@ -0,0 +1 @@
+fix: pool issues

doc/source/examples/extended_examples/hpc/requirements.txt

@@ -40,4 +40,4 @@ tabulate==0.9.0
 tqdm==4.66.3
 urllib3==2.2.2
 vtk==9.3.0
-zipp==3.17.0
+zipp==3.19.1

src/ansys/mapdl/core/cli/list_instances.py

@@ -73,23 +73,35 @@ def list_instances(instances, long, cmd, location):
     mapdl_instances = []
 
     def is_valid_process(proc):
-        valid_status = proc.status in [psutil.STATUS_RUNNING, psutil.STATUS_IDLE]
+        valid_status = proc.status() in [
+            psutil.STATUS_RUNNING,
+            psutil.STATUS_IDLE,
+            psutil.STATUS_SLEEPING,
+        ]
         valid_ansys_process = ("ansys" in proc.name().lower()) or (
             "mapdl" in proc.name().lower()
         )
+        # Early exit to avoid checking 'cmdline' of a protected process (raises psutil.AccessDenied)
+        if not valid_ansys_process:
+            return False
+
         grpc_is_active = "-grpc" in proc.cmdline()
         return valid_status and valid_ansys_process and grpc_is_active
 
     for proc in psutil.process_iter():
         # Check if the process is running and not suspended
-        if is_valid_process(proc):
-            # Checking the number of children we infer if the process is the main process,
-            # or one of the main process thread.
-            if len(proc.children(recursive=True)) < 2:
-                proc.ansys_instance = False
-            else:
-                proc.ansys_instance = True
-            mapdl_instances.append(proc)
+        try:
+            if is_valid_process(proc):
+                # Checking the number of children we infer if the process is the main process,
+                # or one of the main process thread.
+                if len(proc.children(recursive=True)) < 2:
+                    proc.ansys_instance = False
+                else:
+                    proc.ansys_instance = True
+                mapdl_instances.append(proc)
+
+        except (psutil.NoSuchProcess, psutil.ZombieProcess) as e:
+            continue
 
     # printing
     table = []

src/ansys/mapdl/core/cli/stop.py

@@ -23,12 +23,6 @@
 import click
 
 
-def is_ansys_process(proc):
-    return (
-        "ansys" in proc.name().lower() or "mapdl" in proc.name().lower()
-    ) and "-grpc" in proc.cmdline()
-
-
 @click.command(
     short_help="Stop MAPDL instances.",
     help="""This command stop MAPDL instances running on a given port or with a given process id (PID).
@@ -58,6 +52,8 @@ def is_ansys_process(proc):
 def stop(port, pid, all):
     import psutil
 
+    from ansys.mapdl.core.launcher import is_ansys_process
+
     PROCESS_OK_STATUS = [
         # List of all process status, comment out the ones that means that
         # process is not OK.
@@ -84,28 +80,32 @@ def stop(port, pid, all):
     if port or all:
         killed_ = False
         for proc in psutil.process_iter():
-            if (
-                psutil.pid_exists(proc.pid)
-                and proc.status() in PROCESS_OK_STATUS
-                and is_ansys_process(proc)
-            ):
-                # Killing "all"
-                if all:
-                    try:
-                        proc.kill()
-                        killed_ = True
-                    except psutil.NoSuchProcess:
-                        pass
-
-                else:
-                    # Killing by ports
-                    if str(port) in proc.cmdline():
+            try:
+                if (
+                    psutil.pid_exists(proc.pid)
+                    and proc.status() in PROCESS_OK_STATUS
+                    and is_ansys_process(proc)
+                ):
+                    # Killing "all"
+                    if all:
                         try:
                             proc.kill()
                             killed_ = True
                         except psutil.NoSuchProcess:
                             pass
 
+                    else:
+                        # Killing by ports
+                        if str(port) in proc.cmdline():
+                            try:
+                                proc.kill()
+                                killed_ = True
+                            except psutil.NoSuchProcess:
+                                pass
+
+            except psutil.NoSuchProcess:
+                continue
+
         if all:
             str_ = ""
         else:

src/ansys/mapdl/core/launcher.py

@@ -256,6 +256,9 @@ def get_process_at_port(port) -> Optional[psutil.Process]:
             )  # just to check if we can access the
         except psutil.AccessDenied:
             continue
+        except psutil.NoSuchProcess:
+            # process already died
+            continue
 
         for conns in connections:
             if conns.laddr.port == port:

src/ansys/mapdl/core/mapdl_grpc.py

@@ -1059,9 +1059,12 @@ def _remove_temp_dir_on_exit(self, path=None):
 
         """
         if self.remove_temp_dir_on_exit and self._local:
-            path = path or self.directory
+            from pathlib import Path
+
+            path = str(Path(path or self.directory))
             tmp_dir = tempfile.gettempdir()
-            ans_temp_dir = os.path.join(tmp_dir, "ansys_")
+            ans_temp_dir = str(Path(os.path.join(tmp_dir, "ansys_")))
+
             if path.startswith(ans_temp_dir):
                 self._log.debug("Removing the MAPDL temporary directory %s", path)
                 shutil.rmtree(path, ignore_errors=True)