Skip to content

Commit d7df37a

Browse files
authored
Merge branch 'master' into doc/new-tutorials-section
2 parents 0a8fa75 + ea51ae3 commit d7df37a

File tree

1,065 files changed

+86261
-88130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,065 files changed

+86261
-88130
lines changed

.ci/build_wheel.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# Input can be one of ["any", "win", "manylinux1", "manylinux_2_17"]
33

44
import argparse
5-
import subprocess
6-
from pathlib import Path
75
import os
8-
import sys
6+
from pathlib import Path
97
import shutil
8+
import subprocess
9+
import sys
1010
import tempfile
1111

12-
1312
supported_platforms = {
1413
"any": "any",
1514
"win": "win_amd64",
1615
"manylinux1": "manylinux1_x86_64",
1716
"manylinux_2_17": "manylinux_2_17_x86_64",
18-
"linux": "manylinux_2_17_x86_64", # Accommodate tox.ini platform substitutions
17+
# Accommodate tox.ini automatic platform substitutions
18+
"linux": "manylinux_2_17_x86_64",
1919
"win32": "win_amd64",
2020
"darwin": "any",
2121
}
@@ -45,7 +45,7 @@
4545
# Create the temporary build-opts.cfg
4646
build_opts_path = Path(tmpdirname) / "build-opts.cfg"
4747

48-
build_opts_path.write_text(f"[bdist_wheel]\nplat-name={requested_platform}", encoding="utf-8")
48+
build_opts_path.write_text(f"[bdist_wheel]\nplat_name={requested_platform}", encoding="utf-8")
4949
os.environ["DIST_EXTRA_CONFIG"] = str(build_opts_path)
5050

5151
# Move the binaries

.ci/code_generation.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
# import subprocess
22

3-
from ansys.dpf import core
4-
from ansys.dpf.core.operators import build
5-
import os
63
import glob
4+
import os
75
from pathlib import Path
86
import shutil
97

8+
from ansys.dpf import core
9+
from ansys.dpf.core.operators import build
10+
11+
core.set_default_server_context(core.AvailableServerContexts.premium)
12+
core.start_local_server(config=core.AvailableServerConfigs.LegacyGrpcServer)
1013

1114
local_dir = Path(__file__).parent
1215
TARGET_PATH = local_dir.parent / "src" / "ansys" / "dpf" / "core" / "operators"
1316
files = TARGET_PATH.glob("*")
1417
for file_path in files:
1518
if file_path.stem == "specification":
1619
continue
20+
if file_path.stem == "translator":
21+
continue
1722
if file_path.name == "build.py":
1823
continue
1924
if file_path.name == "operator.mustache":
@@ -26,7 +31,4 @@
2631
except:
2732
pass
2833

29-
core.set_default_server_context(core.AvailableServerContexts.premium)
30-
core.start_local_server(config=core.AvailableServerConfigs.LegacyGrpcServer)
31-
3234
build.build_operators()

.ci/run_examples.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import os
21
import glob
2+
import os
33
from pathlib import Path
44
import subprocess
55
import sys
66

77
import ansys.dpf.core as dpf
88
from ansys.dpf.core.examples import get_example_required_minimum_dpf_version
99

10-
1110
os.environ["PYVISTA_OFF_SCREEN"] = "true"
1211
os.environ["MPLBACKEND"] = "Agg"
1312

.ci/run_non_regression_examples.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import os
21
import glob
3-
from ansys.dpf import core
2+
import os
43
import pathlib
54
import subprocess
65
import sys
76

7+
from ansys.dpf import core
8+
89
os.environ["PYVISTA_OFF_SCREEN"] = "true"
910
os.environ["MPLBACKEND"] = "Agg"
1011

.ci/update_dpf_dependencies.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
or the repo defined by the environment variable "ANSYSDPFCORE_ROOT" if it exists.
1414
"""
1515

16-
import os
1716
import glob
17+
import os
1818
from pathlib import Path
1919
import platform
2020
import shutil
2121
import zipfile
2222

23-
2423
grpc_path_key = "DPFDV_ROOT"
2524
gate_path_key = "ANSYSDPFPYGATE_ROOT"
2625
core_path = Path(__file__).parent.parent

.gitattributes

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
*.jpg binary
44+
*.png binary
45+
*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

.github/workflows/ci.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ concurrency:
2727

2828
env:
2929
DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
30-
MAIN_PYTHON_VERSION: '3.9'
30+
MAIN_PYTHON_VERSION: '3.10'
3131

3232
jobs:
3333
debug:
@@ -106,7 +106,7 @@ jobs:
106106
needs: pick_server_suffix
107107
with:
108108
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
109-
python_versions: '["3.9"]'
109+
python_versions: '["3.10"]'
110110
wheel: true
111111
wheelhouse: false
112112
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
@@ -117,7 +117,7 @@ jobs:
117117
needs: pick_server_suffix
118118
with:
119119
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
120-
python_versions: '["3.9"]'
120+
python_versions: '["3.10"]'
121121
wheel: true
122122
wheelhouse: false
123123
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
@@ -139,7 +139,7 @@ jobs:
139139
needs: pick_server_suffix
140140
with:
141141
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
142-
python_versions: '["3.9"]'
142+
python_versions: '["3.10"]'
143143
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
144144
secrets: inherit
145145

@@ -151,6 +151,7 @@ jobs:
151151
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
152152
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
153153
event_name: ${{ github.event_name }}
154+
python_version: "3.11"
154155
secrets: inherit
155156

156157
upload-development-docs:
@@ -174,7 +175,7 @@ jobs:
174175
needs: pick_server_suffix
175176
with:
176177
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
177-
python_versions: '["3.9"]'
178+
python_versions: '["3.10"]'
178179
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
179180
secrets: inherit
180181

@@ -184,7 +185,7 @@ jobs:
184185
uses: ./.github/workflows/tests.yml
185186
with:
186187
ANSYS_VERSION: "251"
187-
python_versions: '["3.9"]'
188+
python_versions: '["3.10"]'
188189
DOCSTRING: false
189190
standalone_suffix: ''
190191
secrets: inherit
@@ -195,7 +196,7 @@ jobs:
195196
uses: ./.github/workflows/tests.yml
196197
with:
197198
ANSYS_VERSION: "242"
198-
python_versions: '["3.9"]'
199+
python_versions: '["3.10"]'
199200
DOCSTRING: false
200201
standalone_suffix: ''
201202
secrets: inherit
@@ -206,7 +207,7 @@ jobs:
206207
uses: ./.github/workflows/tests.yml
207208
with:
208209
ANSYS_VERSION: "241"
209-
python_versions: '["3.9"]'
210+
python_versions: '["3.10"]'
210211
DOCSTRING: false
211212
standalone_suffix: '.sp01'
212213
secrets: inherit
@@ -217,7 +218,7 @@ jobs:
217218
uses: ./.github/workflows/tests.yml
218219
with:
219220
ANSYS_VERSION: "232"
220-
python_versions: '["3.9"]'
221+
python_versions: '["3.10"]'
221222
DOCSTRING: false
222223
standalone_suffix: ''
223224
secrets: inherit
@@ -228,7 +229,7 @@ jobs:
228229
uses: ./.github/workflows/tests.yml
229230
with:
230231
ANSYS_VERSION: "231"
231-
python_versions: '["3.9"]'
232+
python_versions: '["3.10"]'
232233
DOCSTRING: false
233234
secrets: inherit
234235

@@ -238,7 +239,7 @@ jobs:
238239
uses: ./.github/workflows/tests.yml
239240
with:
240241
ANSYS_VERSION: "222"
241-
python_versions: '["3.9"]'
242+
python_versions: '["3.10"]'
242243
DOCSTRING: false
243244
secrets: inherit
244245

0 commit comments

Comments
 (0)