Merge branch 'main' into test-uv

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@v8
+      - uses: ansys/actions/doc-style@v9
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -44,9 +44,9 @@ jobs:
         run: sudo apt install libegl1
 
       - name: Setup headless display
-        uses: pyvista/setup-headless-display-action@v3
+        uses: pyvista/setup-headless-display-action@v4
 
-      - uses: ansys/actions/tests-pytest@v8
+      - uses: ansys/actions/tests-pytest@v9
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -56,7 +56,7 @@ jobs:
     needs: [doc-style]
     steps:
       - name: Build project documentation
-        uses: ansys/actions/doc-build@v8
+        uses: ansys/actions/doc-build@v9
         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@v8
+      - uses: ansys/actions/doc-deploy-dev@v9
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -121,7 +121,7 @@ jobs:
   build-application-linux-debian:
     strategy:
       matrix:
-        os: ["22.04", "20.04"]
+        os: ["24.04", "22.04"]
       fail-fast: false
     name: "Build Application Linux - Ubuntu ${{ matrix.os }}"
     runs-on: ubuntu-${{ matrix.os }}
@@ -165,20 +165,6 @@ jobs:
           sudo apt install ruby -y
           sudo gem install fpm
 
-      - name: Ubuntu-20.04 dependencies
-        if: matrix.os == '20.04'
-        run: |
-          sudo add-apt-repository ppa:okirby/qt6-backports -y
-          sudo apt update
-          sudo apt install qt6-base-dev -y
-
-          wget http://archive.ubuntu.com/ubuntu/pool/main/libf/libffi/libffi8_3.4.2-4_amd64.deb
-          sudo apt install ./libffi8_3.4.2-4_amd64.deb
-
-          wget http://archive.ubuntu.com/ubuntu/pool/main/w/wayland/libwayland-client0_1.20.0-1_amd64.deb
-          sudo apt install ./libwayland-client0_1.20.0-1_amd64.deb
-
-
       - name: Create python-3.11 artifact
         run: |
           mkdir -p cd ${HOME}/.cache
@@ -450,6 +436,25 @@ jobs:
           name: Python-Installer-windows-signed
           path: signtool/installer/*Setup*.exe
 
+  automerge-prs:
+    name: Automerge PRs (dependabot and pre-commit.ci only)
+    runs-on: ubuntu-latest
+    needs:
+      - sign-application-windows
+      - build-application-linux-debian
+      - build-application-linux-non-debian
+      - doc-build
+    if: github.event_name == 'pull_request'
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Automerge PRs
+        uses: ansys/actions/hk-automerge-prs@v9
+        with:
+          approver: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
+          approver-token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
+
   release:
     name: Release application
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
@@ -471,7 +476,7 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: Python-Installer-ubuntu_20.04
+          name: Python-Installer-ubuntu_24.04
           path: installer
 
       - uses: actions/download-artifact@v4
@@ -514,7 +519,7 @@ jobs:
     needs: [release, doc-build]
     steps:
       - name: Deploy the stable documentation
-        uses: ansys/actions/doc-deploy-stable@v8
+        uses: ansys/actions/doc-deploy-stable@v9
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}

.pre-commit-config.yaml

@@ -6,14 +6,14 @@ ci:
 
 repos:
 - repo: https://github.com/pycqa/isort
-  rev: 5.13.2
+  rev: 6.0.1
   hooks:
   - id: isort
     args:
       - --line-length=88
 
 - repo: https://github.com/psf/black
-  rev: 24.10.0
+  rev: 25.1.0
   hooks:
   - id: black
     args:
@@ -26,12 +26,12 @@ repos:
     files: '\.py$'
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 7.1.1
+  rev: 7.2.0
   hooks:
   - id: flake8
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.3.0
+  rev: v2.4.1
   hooks:
   - id: codespell
     args: ["--toml", "pyproject.toml"]
@@ -54,12 +54,12 @@ repos:
 
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.31.0
+  rev: 0.33.0
   hooks:
     - id: check-github-workflows
 
 - repo: https://github.com/ansys/pre-commit-hooks
-  rev: v0.4.4
+  rev: v0.5.2
   hooks:
   - id: add-license-headers
     args:

doc/source/installer.rst

@@ -242,8 +242,6 @@ Two Python options for installation are available:
 
 Regarding the available Python versions, users can select among the following ones:
 
-* Python 3.8
-* Python 3.9
 * Python 3.10
 * Python 3.11
 * Python 3.12
@@ -264,8 +262,8 @@ Regarding the available Python versions, users can select among the following on
         #. Download Python Tarball and Untar:
 
           i. The Python tar file will be downloaded from the Python FTP server (https://www.python.org/ftp/python)
-             based on the version selected from the dropdown menu. Example: For Python version 3.8.11, the download link
-             would be here(https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz).
+             based on the version selected from the dropdown menu. Example: For Python version 3.12.0, the download link
+             would be here(https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tar.xz).
 
           ii.  Decompress the downloaded file in the user’s cache directory.
 

pyproject.toml

@@ -25,7 +25,6 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Information Analysis",
     "License :: OSI Approved :: MIT License",
     "Operating System :: Microsoft :: Windows",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -35,31 +34,31 @@ dynamic = ["version"]
 
 [project.optional-dependencies]
 tests = [
-    "packaging==24.2",
-    "PyGithub==2.5.0",
+    "packaging==25.0",
+    "PyGithub==2.6.1",
     "appdirs==1.4.4",
     "requests==2.32.3",
-    "PySide6==6.8.1",
+    "PySide6==6.9.0",
     "ansys-tools-path==0.7.1",
-    "pytest==8.3.4",
-    "pytest-cov==6.0.0",
+    "pytest==8.3.5",
+    "pytest-cov==6.1.1",
     "pytest-qt==4.4.0",
-    "setuptools==75.8.0",
+    "setuptools==80.0.0",
 ]
 doc = [
-    "Sphinx==8.1.3",
-    "ansys-sphinx-theme==1.2.4",
+    "Sphinx==8.2.3",
+    "ansys-sphinx-theme==1.4.2",
     "sphinx-copybutton==0.5.2",
     "sphinx_design==0.6.1",
-    "sphinx_toolbox==3.8.1",
+    "sphinx_toolbox==3.9.0",
 ]
 freeze = [
-    "pyinstaller==6.11.1",
-    "packaging==24.2",
-    "PyGithub==2.5.0",
+    "pyinstaller==6.13.0",
+    "packaging==25.0",
+    "PyGithub==2.6.1",
     "appdirs==1.4.4",
     "requests==2.32.3",
-    "PySide6==6.8.1",
+    "PySide6==6.9.0",
     "ansys-tools-path==0.7.1",
 ]
 

scripts/requirements.txt

@@ -1,2 +1,2 @@
 requests==2.32.3
-packaging==24.2
+packaging==25.0

scripts/update_python_versions.py

@@ -77,8 +77,6 @@ def get_minor_version_sublist_with_greater_patch(list: list[str], current_versio
 # Example:
 #
 # VANILLA_PYTHON_VERSIONS = {
-#     "Python 3.8": "3.8.10",
-#     "Python 3.9": "3.9.13",
 #     "Python 3.10": "3.10.11",
 #     "Python 3.11": "3.11.6",
 #     "Python 3.12": "3.12.0",

src/ansys/tools/installer/constants.py

@@ -221,11 +221,9 @@
 #
 
 VANILLA_PYTHON_VERSIONS = {
-    "Python 3.8": "3.8.10",
-    "Python 3.9": "3.9.13",
     "Python 3.10": "3.10.11",
     "Python 3.11": "3.11.9",
-    "Python 3.12": "3.12.8",
+    "Python 3.12": "3.12.10",
 }
 
 CONDA_PYTHON_VERSION = "24.1.2-0"

src/ansys/tools/installer/find_python.py

@@ -170,9 +170,6 @@ def _find_installed_python_linux():
     >>> installed_pythons
     {'/home/user/python/py311/bin/python': ('3.11.3', False),
      '/home/user/python/py311/bin/python3': ('3.11.3', False),
-     '/usr/bin/python3.7': ('3.7.16', True),
-     '/usr/bin/python3.8': ('3.8.16', True),
-     '/usr/bin/python3.9': ('3.9.16', True)}
 
     """
     LOG.debug("Identifying all installed versions of python on Linux")

src/ansys/tools/installer/linux_functions.py

@@ -78,11 +78,11 @@ def get_vanilla_url_and_filename(selected_version):
 
     Examples
     --------
-    >>> url, filename = get_vanilla_url_and_filename("3.8.11")
+    >>> url, filename = get_vanilla_url_and_filename("3.12.0")
     >>> url
-    'https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz'
+    'https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tar.xz'
     >>> filename
-    'Python-3.8.11.tar.xz'
+    'Python-3.12.0.tar.xz'
 
     """
     url = f"https://www.python.org/ftp/python/{selected_version}/Python-{selected_version}.tar.xz"
@@ -160,9 +160,7 @@ def find_miniforge_linux(ansys_manager_installed_only=False):
     >>> installed_pythons
     {'/home/user/python/py311/bin/python': ('3.11.3', False),
      '/home/user/python/py311/bin/python3': ('3.11.3', False),
-     '/usr/bin/python3.7': ('3.7.16', True),
-     '/usr/bin/python3.8': ('3.8.16', True),
-     '/usr/bin/python3.9': ('3.9.16', True)}
+     '/usr/bin/python3.12': ('3.12.0', True),
 
     """
     paths = {}
@@ -199,7 +197,7 @@ def create_venv_linux(venv_dir, py_path):
     --------
     >>> create_venv_linux(
     ...     "/home/sha/.local/ansys/.ansys_python_venvs/myenv/bin",
-    ...     "/home/sha/.local/ansys/python-3.8.10/bin/python3",
+    ...     "/home/sha/.local/ansys/python-3.12.0/bin/python3",
     ... )
 
     """
@@ -215,7 +213,7 @@ def create_venv_linux_conda(venv_dir, py_path):
     --------
     >>> create_venv_linux_conda(
     ...     "/home/sha/.local/ansys/.ansys_python_venvs/myenv/bin",
-    ...     "/home/sha/.local/ansys/python-3.8.10/bin/python3",
+    ...     "/home/sha/.local/ansys/python-3.12.0/bin/python3",
     ... )
 
     """
@@ -234,7 +232,7 @@ def delete_venv_conda(miniforge_path, parent_path):
     --------
     >>> delete_venv_conda(
     ...     "/home/sha/.local/ansys/.ansys_python_venvs/myenv/bin",
-    ...     "/home/sha/.local/ansys/python-3.8.10/bin/python3",
+    ...     "/home/sha/.local/ansys/python-3.12.0/bin/python3",
     ... )
 
     """
@@ -247,7 +245,7 @@ def run_linux_command(pypath, extra, venv=False):
 
     Examples
     --------
-    >>> run_linux_command("/home/sha/.local/ansys/python-3.8.10/bin/python3", "uv pip list")
+    >>> run_linux_command("/home/sha/.local/ansys/python-3.12.0/bin/python3", "uv pip list")
 
     """
 
@@ -278,7 +276,7 @@ def run_linux_command_conda(pypath, extra, venv=False):
 
     Examples
     --------
-    >>> run_linux_command_conda("/home/sha/.local/ansys/python-3.8.10/bin/python3", "uv pip list")
+    >>> run_linux_command_conda("/home/sha/.local/ansys/python-3.12.0/bin/python3", "uv pip list")
 
     """
     venvParam = ""
@@ -327,9 +325,8 @@ def find_ansys_installed_python_linux():
     >>> installed_pythons
     {'/home/user/python/py311/bin/python': ('3.11.3', False),
      '/home/user/python/py311/bin/python3': ('3.11.3', False),
-     '/usr/bin/python3.7': ('3.7.16', True),
-     '/usr/bin/python3.8': ('3.8.16', True),
-     '/usr/bin/python3.9': ('3.9.16', True)}
+     '/usr/bin/python3.12.0': ('3.12.0', True),
+
 
     """
     LOG.debug(

tests/test_linux_functions.py

@@ -27,9 +27,9 @@
 
 
 def test_get_vanilla_url_and_filename():
-    url, filename = get_vanilla_url_and_filename("3.8.11")
-    assert url == "https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz"
-    assert filename == "Python-3.8.11.tar.xz"
+    url, filename = get_vanilla_url_and_filename("3.12.0")
+    assert url == "https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tar.xz"
+    assert filename == "Python-3.12.0.tar.xz"
 
 
 def test_get_conda_url_and_filename():