Adding ansys student support (#1335)

* Adding ansys student to search

* Adding SUPPORTED_ANSYS_VERSIONS

* Replacing supported versions in more places.

* Fixing coverage.

* Update src/ansys/mapdl/core/launcher.py

Author: germa89

src/ansys/mapdl/core/__init__.py

@@ -28,6 +28,7 @@
 __version__ = importlib_metadata.version(__name__.replace(".", "-"))
 
 from ansys.mapdl.core import examples
+from ansys.mapdl.core._version import SUPPORTED_ANSYS_VERSIONS
 from ansys.mapdl.core.convert import convert_apdl_block, convert_script
 from ansys.mapdl.core.launcher import (
     change_default_ansys_path,

src/ansys/mapdl/core/_version.py

@@ -16,3 +16,6 @@
 # Read from the pyproject.toml
 # major, minor, patch
 __version__ = importlib_metadata.version("ansys-mapdl-core")
+
+# In descending order
+SUPPORTED_ANSYS_VERSIONS = [222, 221, 212, 211, 202, 201, 195, 194, 193, 192, 191]

src/ansys/mapdl/core/launcher.py

@@ -22,6 +22,7 @@
 
 from ansys.mapdl import core as pymapdl
 from ansys.mapdl.core import LOG
+from ansys.mapdl.core._version import SUPPORTED_ANSYS_VERSIONS
 from ansys.mapdl.core.errors import LockFileException, MapdlDidNotStart, VersionError
 from ansys.mapdl.core.licensing import ALLOWABLE_LICENSES, LicenseChecker
 from ansys.mapdl.core.mapdl import _MapdlCore
@@ -637,8 +638,8 @@ def _get_available_base_ansys():
      211: '/usr/ansys_inc/v211'}
     """
     base_path = None
-    if os.name == "nt":
-        supported_versions = [194, 202, 211, 212, 221]
+    if os.name == "nt":  # pragma: no cover
+        supported_versions = SUPPORTED_ANSYS_VERSIONS
         awp_roots = {
             ver: os.environ.get(f"AWP_ROOT{ver}", "") for ver in supported_versions
         }
@@ -647,20 +648,32 @@ def _get_available_base_ansys():
         }
         if installed_versions:
             return installed_versions
-        else:
+        else:  # pragma: no cover
+            LOG.debug(
+                "No installed ANSYS found using 'AWP_ROOT' environments. Let's suppose a base path."
+            )
             base_path = os.path.join(os.environ["PROGRAMFILES"], "ANSYS INC")
+            if not os.path.exists(base_path):
+                LOG.debug(
+                    f"The supposed 'base_path'{base_path} does not exist. No available ansys found."
+                )
+                return {}
     elif os.name == "posix":
         for path in ["/usr/ansys_inc", "/ansys_inc"]:
             if os.path.isdir(path):
                 base_path = path
-    else:
+    else:  # pragma: no cover
         raise OSError(f"Unsupported OS {os.name}")
 
     if base_path is None:
         return {}
 
     paths = glob(os.path.join(base_path, "v*"))
 
+    # Testing for ANSYS STUDENT version
+    if not paths:  # pragma: no cover
+        paths = glob(os.path.join(base_path, "ANSYS*"))
+
     if not paths:
         return {}
 

tests/conftest.py

@@ -59,19 +59,11 @@ def pytest_configure(config):
 
 # Check if MAPDL is installed
 # NOTE: checks in this order to get the newest installed version
-valid_rver = [
-    "222",
-    "221",
-    "212",
-    "211",
-    "202",
-    "201",
-    "195",
-    "194",
-    "193",
-    "192",
-    "191",
-]
+
+from ansys.mapdl.core._version import SUPPORTED_ANSYS_VERSIONS
+
+valid_rver = [str(each) for each in SUPPORTED_ANSYS_VERSIONS]
+
 EXEC_FILE = None
 for rver in valid_rver:
     if os.path.isfile(get_ansys_bin(rver)):

tests/test_pool.py

@@ -27,7 +27,10 @@
 
 TWAIT = 90
 
-valid_rver = ["221", "212", "211", "202", "201", "195", "194", "193", "192", "191"]
+from ansys.mapdl.core._version import SUPPORTED_ANSYS_VERSIONS
+
+valid_rver = [str(each) for each in SUPPORTED_ANSYS_VERSIONS]
+
 EXEC_FILE = None
 for rver in valid_rver:
     if os.path.isfile(get_ansys_bin(rver)):