Skip to content

Commit 5978ad2

Browse files
PProfiziPProfizi
authored
Merge branch 'master' into feat/op_version
2 parents a41e2ac + 88036f4 commit 5978ad2

File tree

177 files changed

+2110
-10951
lines changed

Some content is hidden

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

177 files changed

+2110
-10951
lines changed

‎.ci/build_wheel.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

‎.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

‎.github/workflows/ci_release.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ jobs:
7373
name: ${{ steps.wheel.outputs.wheel_name }}
7474
path: dist/${{ steps.wheel.outputs.wheel_name }}
7575

76-
tests_3_9:
76+
tests_3_10:
7777
uses: ./.github/workflows/tests.yml
7878
with:
7979
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
80-
python_versions: '["3.9"]'
80+
python_versions: '["3.10"]'
8181
wheel: true
8282
wheelhouse: true
8383
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
@@ -87,18 +87,18 @@ jobs:
8787
uses: ./.github/workflows/tests.yml
8888
with:
8989
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
90-
python_versions: '["3.10", "3.11"]'
90+
python_versions: '["3.11", "3.12"]'
9191
DOCSTRING: false
9292
wheel: false
9393
wheelhouse: true
9494
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
9595
secrets: inherit
9696

97-
tests_any_3_9:
97+
tests_any_3_10:
9898
uses: ./.github/workflows/tests.yml
9999
with:
100100
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
101-
python_versions: '["3.9"]'
101+
python_versions: '["3.10"]'
102102
wheel: true
103103
wheelhouse: false
104104
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
@@ -109,7 +109,7 @@ jobs:
109109
uses: ./.github/workflows/tests.yml
110110
with:
111111
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
112-
python_versions: '["3.10", "3.11"]'
112+
python_versions: '["3.11", "3.12"]'
113113
DOCSTRING: false
114114
wheel: false
115115
wheelhouse: false
@@ -129,7 +129,7 @@ jobs:
129129
uses: ./.github/workflows/examples.yml
130130
with:
131131
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
132-
python_versions: '["3.9", "3.10", "3.11"]'
132+
python_versions: '["3.10", "3.11", "3.12"]'
133133
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
134134
secrets: inherit
135135

@@ -138,7 +138,7 @@ jobs:
138138
uses: ./.github/workflows/tests.yml
139139
with:
140140
ANSYS_VERSION: "242"
141-
python_versions: '["3.9"]'
141+
python_versions: '["3.10"]'
142142
DOCSTRING: false
143143
secrets: inherit
144144

@@ -147,7 +147,7 @@ jobs:
147147
uses: ./.github/workflows/tests.yml
148148
with:
149149
ANSYS_VERSION: "241"
150-
python_versions: '["3.9"]'
150+
python_versions: '["3.10"]'
151151
standalone_suffix: '.sp01'
152152
DOCSTRING: false
153153
secrets: inherit
@@ -157,7 +157,7 @@ jobs:
157157
uses: ./.github/workflows/tests.yml
158158
with:
159159
ANSYS_VERSION: "232"
160-
python_versions: '["3.9"]'
160+
python_versions: '["3.10"]'
161161
DOCSTRING: false
162162
secrets: inherit
163163

@@ -166,7 +166,7 @@ jobs:
166166
uses: ./.github/workflows/tests.yml
167167
with:
168168
ANSYS_VERSION: "231"
169-
python_versions: '["3.9"]'
169+
python_versions: '["3.10"]'
170170
DOCSTRING: false
171171
secrets: inherit
172172

@@ -175,7 +175,7 @@ jobs:
175175
uses: ./.github/workflows/tests.yml
176176
with:
177177
ANSYS_VERSION: "222"
178-
python_versions: '["3.9"]'
178+
python_versions: '["3.10"]'
179179
DOCSTRING: false
180180
secrets: inherit
181181

@@ -236,14 +236,14 @@ jobs:
236236
uses: ./.github/workflows/examples_docker.yml
237237
with:
238238
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
239-
python_versions: '["3.9", "3.10", "3.11"]'
239+
python_versions: '["3.10", "3.11", "3.12"]'
240240
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
241241
secrets: inherit
242242

243243
draft_release:
244244
name: "Draft Release"
245245
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
246-
needs: [style, tests, tests_3_9, tests_any, tests_any_3_9, docs, examples, retro_232, retro_231, retro_222, docker_tests]
246+
needs: [style, tests, tests_3_10, tests_any, tests_any_3_10, docs, examples, retro_232, retro_231, retro_222, docker_tests]
247247
runs-on: ubuntu-latest
248248
steps:
249249
- name: "Download artifacts"

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
python_version:
88
required: false
99
type: string
10-
default: "3.10"
10+
default: "3.11"
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
@@ -29,7 +29,7 @@ on:
2929
description: "Python interpreter"
3030
required: true
3131
type: string
32-
default: "3.10"
32+
default: "3.11"
3333
ANSYS_VERSION:
3434
description: "ANSYS version"
3535
required: true
@@ -44,7 +44,6 @@ on:
4444
env:
4545
PACKAGE_NAME: ansys-dpf-core
4646
MODULE: core
47-
VTK_OSMESA_VERSION: "9.2.20230527.dev0"
4847
jobs:
4948
doc-style:
5049
name: "Check doc style"

‎.github/workflows/examples.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
python_versions:
88
required: false
99
type: string
10-
default: '["3.9"]'
10+
default: '["3.10"]'
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
@@ -24,7 +24,7 @@ on:
2424
description: "Python interpreters to test."
2525
required: true
2626
type: string
27-
default: '["3.9"]'
27+
default: '["3.10"]'
2828
ANSYS_VERSION:
2929
description: "ANSYS version to run."
3030
required: true
@@ -101,7 +101,7 @@ jobs:
101101
- name: "Install package wheel"
102102
shell: bash
103103
run: |
104-
pip install dist/${{ steps.wheel.outputs.wheel_name }}[plotting]
104+
pip install dist/${{ steps.wheel.outputs.wheel_name }}[graphics]
105105
106106
- name: "Install DPF"
107107
id: set-server-path

‎.github/workflows/examples_docker.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
python_versions:
88
required: false
99
type: string
10-
default: '["3.9"]'
10+
default: '["3.10"]'
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
@@ -24,7 +24,7 @@ on:
2424
description: "Python interpreters to test."
2525
required: true
2626
type: string
27-
default: '["3.9"]'
27+
default: '["3.10"]'
2828
ANSYS_VERSION:
2929
description: "ANSYS version to run."
3030
required: true
@@ -97,7 +97,7 @@ jobs:
9797
- name: "Install package wheel"
9898
shell: bash
9999
run: |
100-
pip install dist/${{ steps.wheel.outputs.wheel_name }}[plotting]
100+
pip install dist/${{ steps.wheel.outputs.wheel_name }}[graphics]
101101
102102
- name: "Install DPF"
103103
id: set-server-path

‎.github/workflows/pydpf-post.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
fail-fast: false
5757
matrix:
5858
os: ["windows-latest", "ubuntu-latest"]
59-
python-version: ["3.9"]
59+
python-version: ["3.10"]
6060

6161
steps:
6262
- uses: actions/checkout@v4
@@ -98,7 +98,7 @@ jobs:
9898
- name: "Install ansys-dpf-core wheel"
9999
shell: bash
100100
run: |
101-
pip install dist/${{ steps.wheel.outputs.wheel_name }}[plotting]
101+
pip install dist/${{ steps.wheel.outputs.wheel_name }}[graphics]
102102
103103
- name: "Install DPF"
104104
id: set-server-path

0 commit comments

Comments
 (0)