Merge branch 'main' into ci/add-timeout-to-tests

.ci/build_matrix.sh

@@ -9,7 +9,10 @@ versions=(
     # if added more "latest", change "$LATEST"
     'latest-ubuntu' 
     'latest-ubuntu-student'
+    'v25.2.0'
     'v25.1.0'
+    'v25.1-ubuntu'
+    'v25.1-ubuntu-student'
     'v24.2.0'
     'v24.2-ubuntu'
     'v24.2-ubuntu-student'

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ env:
   PACKAGE_NAME: 'ansys-mapdl-core'
   PACKAGE_NAMESPACE: 'ansys.mapdl.core'
   DOCUMENTATION_CNAME: 'mapdl.docs.pyansys.com'
-  LATEST_VERSION: "242"
+  LATEST_VERSION: "252"
   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 }}
@@ -33,7 +33,7 @@ env:
   DPF_PORT: 21004
   MAPDL_PACKAGE: ghcr.io/ansys/mapdl
   ON_CI: True
-  PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=40'
+  PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=180'
 
 
   BUILD_CHEATSHEET: True

doc/changelog.d/3626.dependencies.md

@@ -0,0 +1 @@
+ci: adding ubuntu 251 and 252

pyproject.toml

@@ -118,7 +118,7 @@ pymapdl_convert_script = "ansys.mapdl.core.cli:old_pymapdl_convert_script_entry_
 pymapdl = "ansys.mapdl.core.cli:main"
 
 [tool.pytest.ini_options]
-addopts = "-rxXsa -vvv --maxfail=10 --random-order-bucket=class --random-order --durations=10 --timeout=40"
+addopts = "-rxXsa -vvv --maxfail=10 --random-order-bucket=class --random-order --durations=10  --timeout=180"
 junit_family = "legacy"
 filterwarnings = [
     "ignore::FutureWarning",

tests/test_database.py

@@ -32,6 +32,8 @@
 from ansys.mapdl.core.misc import random_string
 from conftest import ON_CI, TestClass
 
+SKIP_ON_VERSIONS = ["22.2", "23.1", "23.2", "24.1", "24.2", "25.1", "25.2"]
+
 
 @pytest.fixture(scope="session")
 def db(mapdl):
@@ -49,9 +51,9 @@ def db(mapdl):
         )
 
     ## Exceptions
-    if mapdl_version in ["22.2", "23.1", "23.2", "24.1", "24.2", "25.1"] and ON_CI:
+    if mapdl_version in SKIP_ON_VERSIONS and ON_CI:
         pytest.skip(
-            f"This MAPDL version ({mapdl_version}) docker image seems to not support DB, but local does."
+            f"This MAPDL version ({mapdl_version}) docker image seems to not support DB on CICD."
         )
 
     if mapdl._server_version < (0, 4, 1):  # 2021R2
@@ -87,7 +89,7 @@ def test_database_start_stop(mapdl, cleared):
         )
 
     # Exceptions
-    if mapdl_version in ["22.2", "23.1", "23.2", "24.1", "24.2", "25.1"] and ON_CI:
+    if mapdl_version in SKIP_ON_VERSIONS and ON_CI:
         pytest.skip(
             f"This MAPDL version ({mapdl_version}) docker image seems to not support DB, but local does."
         )

tests/test_dpf.py

@@ -25,7 +25,7 @@
 
 import pytest
 
-from conftest import HAS_DPF, has_dependency, requires
+from conftest import HAS_DPF, ON_CI, has_dependency, requires
 
 if not has_dependency("ansys-dpf-core") or not HAS_DPF:
     pytest.skip(allow_module_level=True)
@@ -36,9 +36,20 @@
 DPF_PORT = os.environ.get("DPF_PORT", DPF_DEFAULT_PORT)  # Set in ci.yaml
 
 
+@pytest.fixture()
+def skip_dpf(mapdl):
+    mapdl_version = str(mapdl.version)
+    if mapdl_version in ["25.2"] and ON_CI:
+        pytest.skip(
+            f"This MAPDL version ({mapdl_version}) docker image seems to not support DPF on CICD.",
+            allow_module_level=True,
+        )
+    return
+
+
 @requires("dpf")
 @requires("ansys-dpf-core")
-def test_dpf_connection():
+def test_dpf_connection(skip_dpf):
     # uses 127.0.0.1 and port 50054 by default
     try:
         grpc_con = dpf.connect_to_server(port=DPF_PORT)
@@ -50,7 +61,7 @@ def test_dpf_connection():
 
 @requires("dpf")
 @requires("ansys-dpf-core")
-def test_upload(mapdl, solved_box, tmpdir):
+def test_upload(skip_dpf, mapdl, solved_box, tmpdir):
     # Download RST file
     rst_path = mapdl.download_result(str(tmpdir.mkdir("tmpdir")))