Skip to content

Commit 01e5bf6

Browse files
committed
backward compatibility
1 parent c646923 commit 01e5bf6

File tree

4 files changed

+23
-14
lines changed

4 files changed

+23
-14
lines changed

ansys/dpf/core/result_info.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -360,20 +360,21 @@ def _get_result(self, numres):
360360
sub_res[sub_res_name] = [ssub_res_rec_name, descr]
361361

362362
qualifiers = []
363-
qual_obj = object_handler.ObjHandler(
364-
data_processing_api=self._data_processing_core_api,
365-
internal_obj=self._api.result_info_get_qualifiers_for_result(self, numres)
366-
)
367-
label_space_api = self._server.get_api_for_type(capi=label_space_capi.LabelSpaceCAPI,
368-
grpcapi=label_space_grpcapi.LabelSpaceGRPCAPI)
369-
num_qual_obj = label_space_api.list_label_spaces_size(qual_obj)
370-
for ires in range(num_qual_obj):
371-
qualifiers.append(
372-
LabelSpace(
373-
label_space=label_space_api.list_label_spaces_at(qual_obj, ires),
374-
obj=self,
375-
server=self._server
376-
))
363+
if self._server.meet_version("5.0"):
364+
qual_obj = object_handler.ObjHandler(
365+
data_processing_api=self._data_processing_core_api,
366+
internal_obj=self._api.result_info_get_qualifiers_for_result(self, numres)
367+
)
368+
label_space_api = self._server.get_api_for_type(capi=label_space_capi.LabelSpaceCAPI,
369+
grpcapi=label_space_grpcapi.LabelSpaceGRPCAPI)
370+
num_qual_obj = label_space_api.list_label_spaces_size(qual_obj)
371+
for ires in range(num_qual_obj):
372+
qualifiers.append(
373+
LabelSpace(
374+
label_space=label_space_api.list_label_spaces_at(qual_obj, ires),
375+
obj=self,
376+
server=self._server
377+
))
377378

378379
availableresult = SimpleNamespace(
379380
name=name, physicsname=physic_name, ncomp=n_comp,

tests/test_operator.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ def test_connect_scoping_operator(server_type):
170170
assert np.allclose(scopOut.ids, list(range(1, 5)))
171171

172172

173+
@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
174+
reason='Copying data is '
175+
'supported starting server version 5.0')
173176
def test_connect_label_space_operator(server_type):
174177
op = dpf.core.Operator("Rescope", server=server_type)
175178
dict = {"time": 1, "complex": 0}

tests/test_python_plugins.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ def test_property_field(server_type_remote_process):
113113
)
114114

115115

116+
@conftest.raises_for_servers_version_under("5.0")
116117
def test_string_field(server_type_remote_process):
117118
load_all_types_plugin_with_serv(server_type_remote_process)
118119
f = dpf.StringField(server=server_type_remote_process)

tests/test_workflow.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@ def test_connect_get_output_double_list_workflow(server_type):
325325
assert np.allclose(d, dout)
326326

327327

328+
@pytest.mark.skipif(not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
329+
reason='Copying data is '
330+
'supported starting server version 5.0')
328331
def test_connect_label_space_workflow(server_type):
329332
wf = dpf.core.Workflow(server=server_type)
330333
op = dpf.core.operators.utility.forward(server=server_type)
@@ -334,6 +337,7 @@ def test_connect_label_space_workflow(server_type):
334337
wf.connect("in", dict)
335338

336339

340+
@conftest.raises_for_servers_version_under('5.0')
337341
def test_connect_get_output_string_field_workflow(server_type):
338342
wf = dpf.core.Workflow(server=server_type)
339343
op = dpf.core.operators.utility.forward(server=server_type)

0 commit comments

Comments
 (0)