Skip to content

Commit 63eca79

Browse files
authored
Merge branch 'master' into ci/drop-py39-tests
2 parents d230db2 + bfe981f commit 63eca79

File tree

8 files changed

+27
-4
lines changed

8 files changed

+27
-4
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,15 @@ jobs:
241241
run: |
242242
tox -e pretest
243243
244+
- name: "Test API test_entry"
245+
uses: nick-fields/retry@v3
246+
with:
247+
timeout_minutes: 10
248+
max_attempts: 2
249+
shell: bash
250+
command: |
251+
tox -e test-api_entry,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }}
252+
244253
- name: "Run compatible tests in parallel"
245254
uses: nick-fields/retry@v3
246255
with:

src/ansys/dpf/core/operators/result/nmisc.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from __future__ import annotations
88

99
from warnings import warn
10+
from ansys.dpf.core.core import errors
1011
from ansys.dpf.core.dpf_operator import Operator
1112
from ansys.dpf.core.inputs import Input, _Inputs
1213
from ansys.dpf.core.outputs import Output, _Outputs
@@ -129,7 +130,13 @@ def __init__(
129130
config=None,
130131
server=None,
131132
):
132-
super().__init__(name="NMISC", config=config, server=server)
133+
try:
134+
super().__init__(name="NMISC", config=config, server=server)
135+
except (KeyError, errors.DPFServerException) as e:
136+
if "doesn't exist in the registry" in str(e):
137+
super().__init__(name="mapdl::nmisc", config=config, server=server)
138+
else:
139+
raise e
133140
self._inputs = InputsNmisc(self)
134141
self._outputs = OutputsNmisc(self)
135142
if time_scoping is not None:

src/ansys/dpf/core/operators/result/smisc.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from __future__ import annotations
88

99
from warnings import warn
10+
from ansys.dpf.core.core import errors
1011
from ansys.dpf.core.dpf_operator import Operator
1112
from ansys.dpf.core.inputs import Input, _Inputs
1213
from ansys.dpf.core.outputs import Output, _Outputs
@@ -131,7 +132,13 @@ def __init__(
131132
config=None,
132133
server=None,
133134
):
134-
super().__init__(name="SMISC", config=config, server=server)
135+
try:
136+
super().__init__(name="SMISC", config=config, server=server)
137+
except (KeyError, errors.DPFServerException) as e:
138+
if "doesn't exist in the registry" in str(e):
139+
super().__init__(name="mapdl::smisc", config=config, server=server)
140+
else:
141+
raise e
135142
self._inputs = InputsSmisc(self)
136143
self._outputs = OutputsSmisc(self)
137144
if time_scoping is not None:
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ description = Default tox environment list and core configurations
3232
envlist = pretest,test-{api,launcher,server,local_server,multi_server,api_entry,custom_type_field,operators,workflow,remote_workflow,remote_operator,service},posttest,kill-servers
3333

3434
labels =
35-
localparalleltests = pretest,test-{api,launcher,server,local_server,multi_server,api_entry,custom_type_field,operators},posttest,kill-servers
35+
localparalleltests = pretest,test-{api,launcher,server,local_server,multi_server,custom_type_field,operators},posttest,kill-servers
3636
othertests = pretest,test-{workflow,remote_workflow,remote_operator,service},posttest,kill-servers
37-
ciparalleltests = test-{api,launcher,local_server,multi_server,api_entry,custom_type_field,operators},kill-servers
37+
ciparalleltests = test-{api,launcher,local_server,multi_server,custom_type_field,operators},kill-servers
3838

3939
isolated_build_env = build
4040

0 commit comments

Comments
 (0)