Merge branch 'main' into release/0.3

Author: RobPasMue

.github/workflows/ci_cd.yml

@@ -24,7 +24,7 @@ jobs:
     name: "Documentation style"
     runs-on: ubuntu-latest
     steps:
-      - uses: ansys/actions/doc-style@v6
+      - uses: ansys/actions/doc-style@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -46,7 +46,7 @@ jobs:
       - name: Setup headless display
         uses: pyvista/setup-headless-display-action@v2
 
-      - uses: ansys/actions/tests-pytest@v6
+      - uses: ansys/actions/tests-pytest@v7
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -56,7 +56,7 @@ jobs:
     needs: [doc-style]
     steps:
       - name: Build project documentation
-        uses: ansys/actions/doc-build@v6
+        uses: ansys/actions/doc-build@v7
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
           dependencies: "libegl1"
@@ -67,7 +67,7 @@ jobs:
     needs: [doc-build]
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: ansys/actions/doc-deploy-dev@v6
+      - uses: ansys/actions/doc-deploy-dev@v7
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -487,7 +487,7 @@ jobs:
     needs: [release, doc-build]
     steps:
       - name: Deploy the stable documentation
-        uses: ansys/actions/doc-deploy-stable@v6
+        uses: ansys/actions/doc-deploy-stable@v7
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
       - --line-length=88
 
 - repo: https://github.com/psf/black
-  rev: 24.4.2
+  rev: 24.8.0
   hooks:
   - id: black
     args:
@@ -26,7 +26,7 @@ repos:
     files: '\.py$'
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 7.1.0
+  rev: 7.1.1
   hooks:
   - id: flake8
 
@@ -54,12 +54,12 @@ repos:
 
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.29.1
+  rev: 0.29.2
   hooks:
     - id: check-github-workflows
 
 - repo: https://github.com/ansys/pre-commit-hooks
-  rev: v0.3.1
+  rev: v0.4.3
   hooks:
   - id: add-license-headers
     args:

doc/source/conf.py

@@ -5,7 +5,6 @@
 import shutil
 
 from ansys_sphinx_theme import get_version_match
-from ansys_sphinx_theme import pyansys_logo_black as logo
 
 from ansys.tools.installer import __version__
 
@@ -17,8 +16,7 @@
 cname = os.getenv("DOCUMENTATION_CNAME", default="nocname.com")
 switcher_version = get_version_match(__version__)
 
-# Select desired logo, theme, and declare the html title
-html_logo = logo
+# Select desired theme, and declare the html title
 html_theme = "ansys_sphinx_theme"
 html_short_title = html_title = "Ansys Python Manager"
 
@@ -30,6 +28,7 @@
     "doc_path": "doc/source",
 }
 html_theme_options = {
+    "logo": "pyansys",
     "switcher": {
         "json_url": f"https://{cname}/versions.json",
         "version_match": switcher_version,

pyproject.toml

@@ -36,27 +36,27 @@ dynamic = ["version"]
 [project.optional-dependencies]
 tests = [
     "packaging==24.1",
-    "PyGithub==2.3.0",
+    "PyGithub==2.4.0",
     "appdirs==1.4.4",
     "requests==2.32.3",
     "PySide6==6.7.2",
     "ansys-tools-path==0.6.0",
     "pytest==8.3.2",
     "pytest-cov==5.0.0",
     "pytest-qt==4.4.0",
-    "setuptools==72.1.0",
+    "setuptools==74.0.0",
 ]
 doc = [
     "Sphinx==8.0.2",
-    "ansys-sphinx-theme==0.16.6",
+    "ansys-sphinx-theme==1.0.7",
     "sphinx-copybutton==0.5.2",
     "sphinx_design==0.6.1",
-    "sphinx_toolbox==3.7.0",
+    "sphinx_toolbox==3.8.0",
 ]
 freeze = [
-    "pyinstaller==6.9.0",
+    "pyinstaller==6.10.0",
     "packaging==24.1",
-    "PyGithub==2.3.0",
+    "PyGithub==2.4.0",
     "appdirs==1.4.4",
     "requests==2.32.3",
     "PySide6==6.7.2",

src/ansys/tools/installer/constants.py

@@ -225,7 +225,7 @@
     "Python 3.9": "3.9.13",
     "Python 3.10": "3.10.11",
     "Python 3.11": "3.11.9",
-    "Python 3.12": "3.12.4",
+    "Python 3.12": "3.12.5",
 }
 
 CONDA_PYTHON_VERSION = "24.1.2-0"

src/ansys/tools/installer/installed_table.py

@@ -541,6 +541,16 @@ def launch_cmd(
         always_use_pip : bool, default: False
             Whether to always use pip for the command or not.
         """
+        path = os.environ["PATH"].split(";")
+        altered_path = path.copy()
+        for p in path:
+            if (
+                "Ansys Python Manager\_internal" in p
+                or "ansys_python_manager\_internal" in p
+            ):
+                altered_path.remove(p)
+        myenv = ";".join(altered_path)
+
         # Handle unexpected bool parameter for linux
         if is_linux_os() and isinstance(extra, bool):
             extra = ""
@@ -567,7 +577,8 @@ def launch_cmd(
 
         if is_vanilla_python and not is_venv:
             scripts_path = os.path.join(py_path, "Scripts")
-            new_path = f"{py_path};{scripts_path};%PATH%"
+
+            new_path = f"{py_path};{scripts_path};{myenv}"
 
             if extra:
                 cmd = f"&& {extra}"
@@ -591,7 +602,7 @@ def launch_cmd(
                 run_linux_command(py_path, extra, True)
             else:
                 subprocess.call(
-                    f'start {min_win} cmd /K "{py_path}\\Scripts\\activate.bat && cd %userprofile% {cmd}"',
+                    f'start {min_win} cmd /K "set PATH={myenv} && {py_path}\\Scripts\\activate.bat && cd %userprofile% {cmd}"',
                     shell=True,
                 )
         elif not is_vanilla_python and is_venv:
@@ -608,7 +619,7 @@ def launch_cmd(
                 run_linux_command_conda(py_path, extra, True)
             else:
                 subprocess.call(
-                    f'start {min_win} cmd /K "{miniforge_path}\\Scripts\\activate.bat && conda activate {py_path} && cd %userprofile% {cmd}"',
+                    f'start {min_win} cmd /K "set PATH={myenv} && {miniforge_path}\\Scripts\\activate.bat && conda activate {py_path} && cd %userprofile% {cmd}"',
                     shell=True,
                 )
         else:
@@ -625,6 +636,6 @@ def launch_cmd(
                 run_linux_command_conda(py_path, extra, False)
             else:
                 subprocess.call(
-                    f'start {min_win} cmd /K "{miniforge_path}\\Scripts\\activate.bat && conda activate {py_path} && cd %userprofile% {cmd}"',
+                    f'start {min_win} cmd /K "set PATH={myenv} && {miniforge_path}\\Scripts\\activate.bat && conda activate {py_path} && cd %userprofile% {cmd}"',
                     shell=True,
                 )