Skip to content

Commit 760422d

Browse files
authored
Merge branch 'master' into dependabot/pip/requirements/sphinx-8.1.3
2 parents 7c9ac45 + c43e575 commit 760422d

File tree

8 files changed

+21
-10
lines changed

8 files changed

+21
-10
lines changed

.ci/run_examples.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
print(file)
3434
minimum_version_str = get_example_required_minimum_dpf_version(file)
3535
if float(server_version) - float(minimum_version_str) < -0.05:
36-
print(f"Example skipped as it requires DPF {minimum_version_str}.")
36+
print(f"Example skipped as it requires DPF {minimum_version_str}.", flush=True)
3737
continue
3838
try:
3939
out = subprocess.check_output([sys.executable, file])
4040
except subprocess.CalledProcessError as e:
4141
sys.stderr.write(str(e.args))
4242
if e.returncode != 3221225477:
43-
print(out)
43+
print(out, flush=True)
4444
raise e
45-
print("PASS")
45+
print("PASS", flush=True)

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ body:
101101
id: installed-packages
102102
attributes:
103103
label: Installed packages
104-
description: Run `python -m pip list` to list installed packages
105-
placeholder: Paste the output of `python -m pip list` here
104+
description: Run `python -m pip freeze` to list installed packages
105+
placeholder: Paste the output of `python -m pip freeze` here
106106
validations:
107107
required: true

.github/workflows/ci_release.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
with:
8989
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
9090
python_versions: '["3.10", "3.11"]'
91+
DOCSTRING: false
9192
wheel: false
9293
wheelhouse: true
9394
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
@@ -109,6 +110,7 @@ jobs:
109110
with:
110111
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
111112
python_versions: '["3.10", "3.11"]'
113+
DOCSTRING: false
112114
wheel: false
113115
wheelhouse: false
114116
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
@@ -131,6 +133,15 @@ jobs:
131133
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
132134
secrets: inherit
133135

136+
retro_242:
137+
name: "retro 242"
138+
uses: ./.github/workflows/tests.yml
139+
with:
140+
ANSYS_VERSION: "242"
141+
python_versions: '["3.9"]'
142+
DOCSTRING: false
143+
secrets: inherit
144+
134145
retro_241:
135146
name: "retro 241"
136147
uses: ./.github/workflows/tests.yml

.github/workflows/examples.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ jobs:
132132
shell: bash
133133
working-directory: .ci
134134
run: |
135-
echo on
136135
python run_examples.py
137136
138137
- name: "Kill all servers"

examples/04-advanced/13-manage_licensing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
# license increment is used, and for what maximum duration.
105105

106106
# Use the LicenseContextManager to block a specific increment for a limited duration
107-
with dpf.LicenseContextManager(increment_name="preppost", license_timeout_in_seconds=1.0) as lic:
107+
with dpf.LicenseContextManager(increment_name="preppost", license_timeout_in_seconds=5.0) as lic:
108108
# Instantiate the licensed operator
109109
out = op_premium.eval()
110110
print(out)

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ plotting = [
4444
"matplotlib>=3.2",
4545
# 3D plotting
4646
"pyvista>=0.32.0",
47+
"vtk!=9.4.0",
4748
# Animations
4849
"imageio < 2.28.1",
4950
"imageio-ffmpeg",

src/ansys/dpf/core/helpers/streamlines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def compute_streamlines(meshed_region, field, **kwargs):
159159
160160
"""
161161
# Check velocity field location
162-
if field.location is not locations.nodal:
162+
if field.location != locations.nodal:
163163
warnings.warn(
164164
"Velocity field must have a nodal location. Result must be carefully checked."
165165
)

tests/test_any.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ def test_cast_scoping_any(server_type):
123123

124124

125125
@pytest.mark.skipif(
126-
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_0,
127-
reason="for_each not implemented below 8.0",
126+
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_9_1,
127+
reason="for_each not implemented below 8.0. Failing for gRPC CLayer below 9.1 for any.whl",
128128
)
129129
def test_cast_workflow_any(server_type):
130130
entity = dpf.Workflow(server=server_type)

0 commit comments

Comments
 (0)