Skip to content

Commit aff43d9

Browse files
authored
chore: remove all deprecated calls in pydpf-core (#2551)
1 parent 3ff3774 commit aff43d9

File tree

3 files changed

+32
-18
lines changed

3 files changed

+32
-18
lines changed

pytest.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[pytest]
22
filterwarnings =
3-
ignore::FutureWarning
4-
ignore::PendingDeprecationWarning
5-
ignore::DeprecationWarning
3+
; ignore:Use explicit output-to-input connections:DeprecationWarning
64
norecursedirs = *
7-
doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
5+
doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
6+
markers =
7+
slow: mark a test as slow.

src/ansys/dpf/core/examples/downloads.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def delete_downloads(verbose=True):
5858
Path(examples.__file__).parent / "__init__.py",
5959
Path(examples.__file__).parent / "downloads.py",
6060
Path(examples.__file__).parent / "examples.py",
61+
Path(examples.__file__).parent / "python_plugins" / "custom_operator_example.py",
6162
]
6263
)
6364
for root, dirs, files in os.walk(LOCAL_DOWNLOADED_EXAMPLES_PATH, topdown=False):

src/ansys/dpf/core/model.py

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from typing import TYPE_CHECKING
3232

3333
if TYPE_CHECKING: # pragma: nocover
34+
from ansys.dpf.core.operators.mesh.mesh_provider import mesh_provider as mesh_provider_op
3435
from ansys.dpf.core.scoping import Scoping
3536
from ansys.dpf.core.server_types import AnyServerType
3637

@@ -321,7 +322,7 @@ def _cache_streams_provider(self):
321322
)
322323
else:
323324
self._stream_provider = Operator("stream_provider", server=self._server)
324-
self._stream_provider.inputs.connect(self._data_sources)
325+
self._stream_provider.inputs.data_sources.connect(self._data_sources)
325326
try:
326327
self._stream_provider.run()
327328
except:
@@ -369,12 +370,16 @@ def time_freq_support(self):
369370
370371
"""
371372
if self._time_freq_support is None:
372-
timeProvider = Operator("TimeFreqSupportProvider", server=self._server)
373+
time_provider: dpf.core.operators.metadata.time_freq_provider = Operator(
374+
name="TimeFreqSupportProvider", server=self._server
375+
)
373376
if self._stream_provider:
374-
timeProvider.inputs.connect(self._stream_provider.outputs)
377+
time_provider.inputs.streams_container.connect(
378+
self._stream_provider.outputs.streams_container
379+
)
375380
else:
376-
timeProvider.inputs.connect(self.data_sources)
377-
self._time_freq_support = timeProvider.get_output(0, types.time_freq_support)
381+
time_provider.inputs.data_sources.connect(self.data_sources)
382+
self._time_freq_support = time_provider.get_output(0, types.time_freq_support)
378383
return self._time_freq_support
379384

380385
@property
@@ -443,7 +448,7 @@ def _set_data_sources(self, var_inp):
443448
def _load_result_info(self):
444449
"""Return a result info object."""
445450
op = Operator("ResultInfoProvider", server=self._server)
446-
op.inputs.connect(self._stream_provider.outputs)
451+
op.inputs.streams_container.connect(self._stream_provider.outputs.streams_container)
447452
try:
448453
result_info = op.get_output(0, types.result_info)
449454
except Exception as e:
@@ -491,7 +496,7 @@ def meshed_region(self):
491496
return self._meshed_region
492497

493498
@property
494-
def mesh_provider(self):
499+
def mesh_provider(self) -> mesh_provider_op:
495500
"""Mesh provider operator.
496501
497502
This operator reads a mesh from the result file. The underlying
@@ -500,15 +505,19 @@ def mesh_provider(self):
500505
501506
Returns
502507
-------
503-
mesh_provider : :class:`ansys.dpf.core.operators.mesh.mesh_provider`
508+
mesh_provider:
504509
Mesh provider operator.
505510
506511
"""
507-
mesh_provider = Operator("MeshProvider", server=self._server)
512+
mesh_provider: dpf.core.operators.mesh.mesh_provider = Operator(
513+
name="MeshProvider", server=self._server
514+
)
508515
if self._stream_provider:
509-
mesh_provider.inputs.connect(self._stream_provider.outputs)
516+
mesh_provider.inputs.streams_container.connect(
517+
self._stream_provider.outputs.streams_container
518+
)
510519
else:
511-
mesh_provider.inputs.connect(self.data_sources)
520+
mesh_provider.inputs.data_sources.connect(self.data_sources)
512521
return mesh_provider
513522

514523
@property
@@ -577,11 +586,15 @@ def meshes_provider(self):
577586
Underlying operator symbol is
578587
"meshes_provider" operator
579588
"""
580-
meshes_provider = Operator("meshes_provider", server=self._server)
589+
meshes_provider: dpf.core.operators.mesh.meshes_provider = Operator(
590+
name="meshes_provider", server=self._server
591+
)
581592
if self._stream_provider:
582-
meshes_provider.inputs.connect(self._stream_provider.outputs)
593+
meshes_provider.inputs.streams_container.connect(
594+
self._stream_provider.outputs.streams_container
595+
)
583596
else:
584-
meshes_provider.inputs.connect(self.data_sources)
597+
meshes_provider.inputs.data_sources.connect(self.data_sources)
585598
return meshes_provider
586599

587600
@property

0 commit comments

Comments
 (0)