Skip to content

Commit d8cd11f

Browse files
build: remove mentions of deprecated pyansys-tools-versioning package (#4380)
* build: remove mentions of deprecated pyansys-tools-versioning package * chore: adding changelog file 4380.dependencies.md [dependabot-skip] * chore: empty commit * build: add build-test-ubuntu-minimal to job dependencies * build: update import path for server_meets_version to use common versioning * build: add missing dependency for tabulate and improve assertions in tests * build: mark flaky tests in test_grpc.py and test_launcher.py --------- Co-authored-by: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com>
1 parent e794c0f commit d8cd11f

File tree

12 files changed

+16
-17
lines changed

12 files changed

+16
-17
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ updates:
4545
- "numpy"
4646
- "platformdirs"
4747
- "psutil"
48-
- "pyansys-tools-versioning"
4948

5049
grpc-deps:
5150
patterns:
@@ -70,7 +69,6 @@ updates:
7069
- "ansys-api-mapdl"
7170
- "ansys-dpf-core"
7271
- "pyansys-tools-report"
73-
- "pyansys-tools-versioning"
7472

7573
documentation:
7674
patterns:

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ jobs:
355355

356356
package:
357357
name: "Package library"
358-
needs: [build-test-remote, build-test-ubuntu-local, docs-build] # TODO: add build-test-ubuntu-minimal when re-enabled
358+
needs: [build-test-remote, build-test-ubuntu-local, docs-build, build-test-ubuntu-minimal]
359359
runs-on: ubuntu-latest
360360
permissions:
361361
contents: read # Needed to read repository contents for packaging
@@ -440,7 +440,7 @@ jobs:
440440

441441
notify:
442442
name: "Notify failed build"
443-
needs: [smoke-tests, docs-build, build-test-remote, build-test-ubuntu-local] # TODO: add build-test-ubuntu-minimal when re-enabled
443+
needs: [smoke-tests, docs-build, build-test-remote, build-test-ubuntu-local, build-test-ubuntu-minimal]
444444
if: failure() && github.event_name == 'schedule'
445445
runs-on: ubuntu-latest
446446
permissions:
@@ -480,8 +480,8 @@ jobs:
480480
pytest-summary:
481481
name: Pytest summary for all the test jobs
482482
needs: [
483-
build-test-remote, build-test-ubuntu-local, build-test-ubuntu-console
484-
] # TODO: add build-test-ubuntu-minimal when re-enabled
483+
build-test-remote, build-test-ubuntu-local, build-test-ubuntu-console, build-test-ubuntu-minimal
484+
]
485485
if: always()
486486
runs-on: ubuntu-latest
487487
permissions:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove mentions of deprecated pyansys-tools-versioning package

src/ansys/mapdl/core/database/database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import weakref
3030

3131
from ansys.api.mapdl.v0 import mapdl_db_pb2_grpc
32-
from ansys.tools.versioning import server_meets_version
32+
from ansys.tools.common.versioning import server_meets_version
3333
import grpc
3434

3535
from ansys.mapdl.core.errors import MapdlConnectionError

src/ansys/mapdl/core/mapdl_grpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
from warnings import warn
4242
import weakref
4343

44-
from ansys.tools.versioning.utils import version_string_as_tuple
44+
from ansys.tools.common.versioning import version_string_as_tuple
4545
import grpc
4646
from grpc._channel import _InactiveRpcError, _MultiThreadedRendezvous
4747
import numpy as np

src/ansys/mapdl/core/plotting/theme.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
PyMAPDL_cmap: ListedColormap = ListedColormap(MAPDL_colorbar, name="PyMAPDL")
5353

5454
if _HAS_PYVISTA:
55-
from ansys.tools.versioning.utils import version_string_as_tuple # type: ignore
55+
from ansys.tools.common.versioning import version_string_as_tuple # type: ignore
5656
from cycler import Cycler
5757
from pyvista import __version__ as pyvista_version
5858
from pyvista.plotting.colors import get_cycler # type: ignore

tests/test_cli.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ def mock_kill_process(proc: psutil.Process):
331331

332332

333333
@requires("click")
334+
@requires("tabulate")
334335
@pytest.mark.parametrize(
335336
"arg,check",
336337
(

tests/test_database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import os
2424
import re
2525

26-
from ansys.tools.versioning import server_meets_version
26+
from ansys.tools.common.versioning import server_meets_version
2727
import numpy as np
2828
import pytest
2929

tests/test_grpc.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ def test_download_project_extensions(mapdl, cleared, tmpdir):
443443
assert expected.intersection(files_extensions) == {"log", "err"}
444444

445445

446+
@pytest.mark.xfail(strict=False, reason="Flaky test")
446447
def test_download_result(mapdl, cleared, tmpdir):
447448
if "file.rst" not in mapdl.list_files():
448449
write_tmp_in_mapdl_instance(mapdl, "file", ext="rst") # fake rst file

tests/test_krylov.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"""Tests comparing results of krylov pymadl function with apdl macro"""
2424
import os
2525

26-
from ansys.tools.versioning.utils import server_meets_version
26+
from ansys.tools.common.versioning import server_meets_version
2727
import numpy as np
2828
import pytest
2929

0 commit comments

Comments
 (0)