Follow-up on Ansys Python installations (#97)

Author: RobPasMue

src/ansys/tools/installer/constants.py

@@ -8,9 +8,6 @@
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel("DEBUG")
-ANSYS_ENV_VAR_START = "awp_root"
-ANSYS_SUPPORTED_PYTHON_VERSIONS = ["3_7", "3_10"]
-
 
 ABOUT_TEXT = f"""<h2>Ansys Python Installer {__version__}</h2>
 <p>Created by the PyAnsys Team.</p>
@@ -28,13 +25,16 @@
 
 ANSYS_VENVS = ".ansys_python_venvs"
 
+ANSYS_ENV_VAR_START = "awp_root"
+
+ANSYS_SUPPORTED_PYTHON_VERSIONS = ["3_7", "3_10"]
+
 INSTALL_TEXT = """Choose to use either the standard Python install from <a href='https://www.python.org/'>python.org</a> or <a href='https://github.com/conda-forge/miniforge'>miniforge</a>."""
 
 PYTHON_VERSION_TEXT = """Choose the version of Python to install.
 
 While choosing the latest version of Python is generally recommended, some third-party libraries and applications may not yet be fully compatible with the newest release. Therefore, it is recommended to try the second newest version, as it will still have most of the latest features and improvements while also having broader support among third-party packages."""
 
-
 PYTHON_VERSION_SELECTION_FOR_VENV = """Choose the version of Python to use for your virtual environment.
 
 Please select the Python version from the table below to create its respective virtual environment."""
@@ -59,6 +59,7 @@
 
 
 ASSETS_PATH = os.path.join(THIS_PATH, "assets")
+
 ANSYS_FAVICON = os.path.join(ASSETS_PATH, "ansys-favicon.png")
 
 PYANSYS_DOCS_SITES = {

src/ansys/tools/installer/find_python.py

@@ -105,39 +105,34 @@ def _find_installed_python_win(admin=False):
 
 
 def _find_installed_ansys_win():
-    """Check the environment variables for ansys installation."""
-    env_keys = list()
+    """Check the environment variables for Ansys installations."""
+    env_keys = []
     for key in os.environ.keys():
         if key.lower().startswith(ANSYS_ENV_VAR_START):
             env_keys.append(key)
     return env_keys
 
 
 def _find_installed_ansys_python_win():
-    """Check the ansys installation folder for installed Python."""
+    """Check the Ansys installation folder for installed Python."""
     installed_ansys = _find_installed_ansys_win()
     paths = {}
-    ansys_python_path_items = [
-        "commonfiles",
-        "CPython",
-        "<platform>",
-        "winx64",
-        "Release",
-        "python",
-        "python.exe",
-    ]
     for ansys_ver_env_key in installed_ansys:
         ansys_path = os.environ[ansys_ver_env_key]
-        for supp_py_ver in ANSYS_SUPPORTED_PYTHON_VERSIONS:
-            ansys_python_path_items[2] = supp_py_ver
-            path = os.path.join(ansys_path, *ansys_python_path_items)
+        for ansys_py_ver in ANSYS_SUPPORTED_PYTHON_VERSIONS:
+            path = os.path.join(
+                ansys_path,
+                f"commonfiles\\CPython\\{ansys_py_ver}\\winx64\\Release\\python",
+            )
             if os.path.exists(path):
                 version_output = subprocess.check_output(
-                    [path, "--version"], text=True
+                    [f"{path}\\python.exe", "--version"], text=True
                 ).strip()
-                version = version_output.split()[1]
-                if version is not None and path is not None:
+                try:
+                    version = version_output.split()[1]
                     paths[path] = (version, False)
+                except Exception:
+                    pass
 
     return paths