Skip to content

Commit 1835348

Browse files
PProfiziPProfizi
authored
Merge branch 'master' into fix/make_tmp_dir
2 parents 3198fcb + 8917810 commit 1835348

File tree

672 files changed

+3765
-1687
lines changed

Some content is hidden

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

672 files changed

+3765
-1687
lines changed

‎.ci/code_generation.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,11 @@
9595
except Exception as e:
9696
print(f"Could not generate operators for optional library {lib}:\n{str(e)}")
9797

98+
# Reorder imports alphabetically in __init__.py files to reduce changes raised
99+
for init_file_path in glob.glob(os.path.join(TARGET_PATH, "**/__init__.py"), recursive=True):
100+
with open(init_file_path, "r") as init_file:
101+
lines = init_file.readlines()
102+
with open(init_file_path, "w") as init_file:
103+
init_file.writelines(sorted(lines))
104+
98105
build.build_operators()

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ body:
1616
label: Before submitting the issue
1717
description: Please, make sure the following conditions are met
1818
options:
19-
- label: I have checked for [Compatibility](https://dpf.docs.pyansys.com/getting_started/compatibility.html#id1) issues
19+
- label: I have checked for [Compatibility](https://dpf.docs.pyansys.com/version/stable/getting_started/compatibility.html#id1) issues
2020
required: true
2121
- label: I have searched among the existing issues
2222
required: true
@@ -46,8 +46,8 @@ body:
4646
- type: dropdown
4747
id: os-name
4848
attributes:
49-
label: Which Operating System are you using?
50-
multiple: false
49+
label: Which Operating System causes the issue?
50+
multiple: true
5151
options:
5252
- 'Windows'
5353
- 'MacOS'
@@ -61,7 +61,10 @@ body:
6161
label: Which DPF/Ansys version are you using?
6262
multiple: false
6363
options:
64-
- 'DPF Server as standalone'
64+
- 'Ansys 2024 R1'
65+
- 'Ansys 2023 R2'
66+
- 'DPF Server 2023.2.pre1'
67+
- 'DPF Server 2023.2.pre0'
6568
- 'Ansys 2023 R1'
6669
- 'Ansys 2022 R2'
6770
- 'Ansys 2022 R1'
@@ -73,14 +76,15 @@ body:
7376
- type: dropdown
7477
id: python-version
7578
attributes:
76-
label: Which Python version are you using?
79+
label: Which Python version causes the issue?
7780
description: Run `python --version` to verify your Python version
78-
multiple: false
81+
multiple: true
7982
options:
8083
- '3.7'
8184
- '3.8'
8285
- '3.9'
8386
- '3.10'
87+
- '3.11'
8488
validations:
8589
required: true
8690

‎.github/ISSUE_TEMPLATE/examples.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: 🎓 Adding an example
2+
description: Proposing a new example for the library
3+
title: "Example proposal: ..."
4+
labels: ["example"]
5+
assignees: [""]
6+
7+
body:
8+
9+
- type: textarea
10+
id: example-description
11+
attributes:
12+
label: '📝 Description of the example'
13+
placeholder: Describe what example you devised and why it is useful for the project.
14+
15+
validations:
16+
required: true
17+
18+
- type: textarea
19+
id: example-files
20+
attributes:
21+
label: '📁 Files needed for running the example'
22+
placeholder: >
23+
Drag and drop the files used in your example, together with the script employed.
24+
Test the example files before uploading to ensure they at least run on your machine.
25+
Add any additional comments/explanations that maintainers may need for running the example.
26+
If you have issues uploading your files because of the file extension/type, upload them
27+
as a .zip file.
28+
validations:
29+
required: true
30+
31+
- type: dropdown
32+
id: os-name
33+
attributes:
34+
label: '💻 Which operating system are you using?'
35+
multiple: false
36+
options:
37+
- 'Windows'
38+
- 'MacOS'
39+
- 'Linux'
40+
validations:
41+
required: true
42+
43+
- type: textarea
44+
id: ansys-version
45+
attributes:
46+
label: '📀 Which ANSYS version are you using?'
47+
placeholder: Indicate the ANSYS version of the products you are using.
48+
49+
validations:
50+
required: false
51+
52+
- type: dropdown
53+
id: python-version
54+
attributes:
55+
label: '🐍 Which Python version are you using?'
56+
description: Run `python --version` to verify your Python version
57+
multiple: false
58+
options:
59+
- '3.7'
60+
- '3.8'
61+
- '3.9'
62+
- '3.10'
63+
- '3.11'
64+
validations:
65+
required: true
66+
67+
- type: textarea
68+
id: installed-packages
69+
attributes:
70+
label: '📦 Installed packages'
71+
description: Run `python -m pip freeze` to list installed packages
72+
placeholder: Paste the output of `python -m pip freeze` here.
73+
render: shell
74+
validations:
75+
required: true

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
description: "extra pip --find-links argument to find custom dpf wheels"
2424
required: false
2525
type: string
26-
default: './dpf-standalone/v232/dist'
26+
default: './dpf-standalone/v241/dist'
2727
custom-wheels-docker:
2828
description: "extra pip --find-links argument to find custom dpf wheels"
2929
required: false
@@ -36,7 +36,6 @@ concurrency:
3636
cancel-in-progress: true
3737

3838
env:
39-
ANSYS_VERSION: 232
4039
DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
4140
MAIN_PYTHON_VERSION: '3.8'
4241

@@ -56,7 +55,7 @@ jobs:
5655
- uses: actions/checkout@v3
5756

5857
- name: "Setup Python"
59-
uses: actions/setup-python@v4
58+
uses: actions/setup-python@v4.6.0
6059
with:
6160
python-version: ${{ env.MAIN_PYTHON_VERSION }}
6261

@@ -69,19 +68,20 @@ jobs:
6968
tests:
7069
uses: ./.github/workflows/tests.yml
7170
with:
72-
ANSYS_VERSION: "232"
71+
ANSYS_VERSION: "241"
7372
python_versions: '["3.8"]'
7473
wheel: true
7574
wheelhouse: false
7675
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
7776
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
78-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
77+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
7978
secrets: inherit
8079

8180
docker_tests:
8281
name: "Build and Test on Docker"
8382
uses: ./.github/workflows/test_docker.yml
8483
with:
84+
ANSYS_VERSION: "241"
8585
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
8686
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
8787
custom-wheels: ${{ github.event.inputs.custom-wheels-docker || './dpf-standalone/dist' }}
@@ -91,7 +91,7 @@ jobs:
9191
name: "Run examples on Docker"
9292
uses: ./.github/workflows/examples_docker.yml
9393
with:
94-
ANSYS_VERSION: "232"
94+
ANSYS_VERSION: "241"
9595
python_versions: '["3.8"]'
9696
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
9797
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
@@ -102,10 +102,10 @@ jobs:
102102
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
103103
uses: ./.github/workflows/docs.yml
104104
with:
105-
ANSYS_VERSION: "232"
105+
ANSYS_VERSION: "241"
106106
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
107107
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
108-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
108+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
109109
event_name: ${{ github.event_name }}
110110
secrets: inherit
111111

@@ -115,7 +115,7 @@ jobs:
115115
needs: [docs]
116116
steps:
117117
- name: "Upload development documentation"
118-
uses: pyansys/actions/doc-deploy-dev@v4
118+
uses: ansys/actions/doc-deploy-dev@v4
119119
with:
120120
cname: ${{ env.DOCUMENTATION_CNAME }}
121121
token: ${{ secrets.GITHUB_TOKEN }}
@@ -125,11 +125,23 @@ jobs:
125125
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
126126
uses: ./.github/workflows/examples.yml
127127
with:
128-
ANSYS_VERSION: "232"
128+
ANSYS_VERSION: "241"
129129
python_versions: '["3.8"]'
130130
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
131131
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
132-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
132+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
133+
secrets: inherit
134+
135+
retro_232:
136+
name: "retro 232"
137+
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
138+
uses: ./.github/workflows/tests.yml
139+
with:
140+
ANSYS_VERSION: "232"
141+
python_versions: '["3.8"]'
142+
DOCSTRING: false
143+
standalone_suffix: ''
144+
custom-wheels: './dpf-standalone/v232/dist --pre'
133145
secrets: inherit
134146

135147
retro_231:
@@ -170,9 +182,9 @@ jobs:
170182
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
171183
uses: ./.github/workflows/pydpf-post.yml
172184
with:
173-
ANSYS_VERSION: "232"
185+
ANSYS_VERSION: "241"
174186
post_branch: "master"
175187
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
176188
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
177-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
189+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
178190
secrets: inherit

‎.github/workflows/ci_release.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/checkout@v3
4545

4646
- name: "Setup Python"
47-
uses: actions/setup-python@v4
47+
uses: actions/setup-python@v4.6.0
4848
with:
4949
python-version: ${{ env.MAIN_PYTHON_VERSION }}
5050

@@ -157,8 +157,6 @@ jobs:
157157
ANSYS_VERSION: "232"
158158
python_versions: '["3.8", "3.9", "3.10"]'
159159
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
160-
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
161-
custom-wheels: ${{ github.event.inputs.custom-wheels-docker || './dpf-standalone/dist' }}
162160
secrets: inherit
163161

164162
draft_release:
@@ -168,7 +166,7 @@ jobs:
168166
runs-on: ubuntu-latest
169167
steps:
170168
- name: "Set up Python"
171-
uses: actions/setup-python@v4.1.0
169+
uses: actions/setup-python@v4.6.0
172170
with:
173171
python-version: 3.9
174172

‎.github/workflows/docs.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
14-
default: "232"
14+
default: "241"
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -44,7 +44,7 @@ on:
4444
description: "ANSYS version"
4545
required: true
4646
type: string
47-
default: "232"
47+
default: "241"
4848
standalone_suffix:
4949
description: "Suffix of the branch on standalone"
5050
required: false
@@ -87,13 +87,13 @@ jobs:
8787
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
8888
8989
- name: Setup Python
90-
uses: actions/setup-python@v4.2.0
90+
uses: actions/setup-python@v4.6.0
9191
with:
9292
python-version: ${{ inputs.python_version }}
9393

9494
- name: "Build Package"
9595
id: build-package
96-
uses: pyansys/pydpf-actions/[email protected]
96+
uses: ansys/pydpf-actions/[email protected]
9797
with:
9898
python-version: ${{ inputs.python_version }}
9999
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
@@ -122,7 +122,7 @@ jobs:
122122
pip install -r requirements/requirements_docs.txt
123123
124124
- name: "Kill all servers"
125-
uses: pyansys/pydpf-actions/[email protected]
125+
uses: ansys/pydpf-actions/[email protected]
126126

127127
- name: "List installed packages"
128128
shell: bash
@@ -152,7 +152,7 @@ jobs:
152152
esac
153153
154154
- name: "Kill all servers"
155-
uses: pyansys/pydpf-actions/[email protected]
155+
uses: ansys/pydpf-actions/[email protected]
156156
if: always()
157157

158158
- name: "Retrieve package version"

‎.github/workflows/examples.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
14-
default: "232"
14+
default: "241"
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -39,7 +39,7 @@ on:
3939
description: "ANSYS version to run."
4040
required: true
4141
type: string
42-
default: "232"
42+
default: "241"
4343
standalone_suffix:
4444
description: "Suffix of the branch on standalone"
4545
required: false
@@ -92,12 +92,12 @@ jobs:
9292
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
9393
9494
- name: Setup Python
95-
uses: actions/setup-python@v4.2.0
95+
uses: actions/setup-python@v4.6.0
9696
with:
9797
python-version: ${{ matrix.python-version }}
9898

9999
- name: "Build Package"
100-
uses: pyansys/pydpf-actions/[email protected]
100+
uses: ansys/pydpf-actions/[email protected]
101101
with:
102102
python-version: ${{ matrix.python-version }}
103103
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
@@ -112,7 +112,7 @@ jobs:
112112
custom-requirements: ${{ inputs.custom-requirements }}
113113

114114
- name: "Prepare Testing Environment"
115-
uses: pyansys/pydpf-actions/[email protected]
115+
uses: ansys/pydpf-actions/[email protected]
116116
with:
117117
DEBUG: true
118118

@@ -128,5 +128,5 @@ jobs:
128128
python run_examples.py
129129
130130
- name: "Kill all servers"
131-
uses: pyansys/pydpf-actions/[email protected]
131+
uses: ansys/pydpf-actions/[email protected]
132132
if: always()

0 commit comments

Comments
 (0)