Skip to content

Commit dea5635

Browse files
PProfiziPProfizi
authored
Merge branch 'master' into dependabot/pip/requirements/pypandoc-1.11
2 parents 23b57d7 + fa2888f commit dea5635

File tree

687 files changed

+20035
-1485
lines changed

Some content is hidden

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

687 files changed

+20035
-1485
lines changed

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 8 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,8 @@ body:
6161
label: Which DPF/Ansys version are you using?
6262
multiple: false
6363
options:
64-
- 'DPF Server as standalone'
64+
- 'DPF Server 2023.2.pre1'
65+
- 'DPF Server 2023.2.pre0'
6566
- 'Ansys 2023 R1'
6667
- 'Ansys 2022 R2'
6768
- 'Ansys 2022 R1'
@@ -73,14 +74,15 @@ body:
7374
- type: dropdown
7475
id: python-version
7576
attributes:
76-
label: Which Python version are you using?
77+
label: Which Python version causes the issue?
7778
description: Run `python --version` to verify your Python version
78-
multiple: false
79+
multiple: true
7980
options:
8081
- '3.7'
8182
- '3.8'
8283
- '3.9'
8384
- '3.10'
85+
- '3.11'
8486
validations:
8587
required: true
8688

‎.github/workflows/ci.yml‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,21 @@ on:
1414
description: 'Suffix of the branch on standalone'
1515
required: false
1616
default: ''
17+
custom-requirements:
18+
description: "Path to requirements.txt file to install"
19+
required: false
20+
type: string
21+
default: 'requirements/requirements_dev.txt'
22+
custom-wheels:
23+
description: "extra pip --find-links argument to find custom dpf wheels"
24+
required: false
25+
type: string
26+
default: './dpf-standalone/v232/dist'
27+
custom-wheels-docker:
28+
description: "extra pip --find-links argument to find custom dpf wheels"
29+
required: false
30+
type: string
31+
default: './dpf-standalone/dist'
1732

1833

1934
concurrency:
@@ -41,7 +56,7 @@ jobs:
4156
- uses: actions/checkout@v3
4257

4358
- name: "Setup Python"
44-
uses: actions/setup-python@v4
59+
uses: actions/setup-python@v4.6.0
4560
with:
4661
python-version: ${{ env.MAIN_PYTHON_VERSION }}
4762

@@ -59,17 +74,28 @@ jobs:
5974
wheel: true
6075
wheelhouse: false
6176
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
62-
custom-requirements: requirements/requirements_dev.txt
63-
custom-wheels: './dpf-standalone/v232/dist'
77+
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
78+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
6479
secrets: inherit
6580

6681
docker_tests:
6782
name: "Build and Test on Docker"
6883
uses: ./.github/workflows/test_docker.yml
6984
with:
7085
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
71-
custom-requirements: requirements/requirements_dev.txt
72-
custom-wheels: 'dpf-standalone/dist'
86+
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
87+
custom-wheels: ${{ github.event.inputs.custom-wheels-docker || './dpf-standalone/dist' }}
88+
secrets: inherit
89+
90+
docker_examples:
91+
name: "Run examples on Docker"
92+
uses: ./.github/workflows/examples_docker.yml
93+
with:
94+
ANSYS_VERSION: "232"
95+
python_versions: '["3.8"]'
96+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
97+
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
98+
custom-wheels: ${{ github.event.inputs.custom-wheels-docker || './dpf-standalone/dist' }}
7399
secrets: inherit
74100

75101
docs:
@@ -78,8 +104,8 @@ jobs:
78104
with:
79105
ANSYS_VERSION: "232"
80106
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
81-
custom-requirements: requirements/requirements_dev.txt
82-
custom-wheels: './dpf-standalone/v232/dist'
107+
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
108+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
83109
event_name: ${{ github.event_name }}
84110
secrets: inherit
85111

@@ -89,10 +115,11 @@ jobs:
89115
needs: [docs]
90116
steps:
91117
- name: "Upload development documentation"
92-
uses: pyansys/actions/doc-deploy-dev@v4
118+
uses: ansys/actions/doc-deploy-dev@v4
93119
with:
94120
cname: ${{ env.DOCUMENTATION_CNAME }}
95121
token: ${{ secrets.GITHUB_TOKEN }}
122+
doc-artifact-name: HTML-doc-ansys-dpf-core.zip
96123

97124
examples:
98125
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
@@ -101,8 +128,8 @@ jobs:
101128
ANSYS_VERSION: "232"
102129
python_versions: '["3.8"]'
103130
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
104-
custom-requirements: requirements/requirements_dev.txt
105-
custom-wheels: './dpf-standalone/v232/dist'
131+
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
132+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
106133
secrets: inherit
107134

108135
retro_231:
@@ -144,7 +171,8 @@ jobs:
144171
uses: ./.github/workflows/pydpf-post.yml
145172
with:
146173
ANSYS_VERSION: "232"
174+
post_branch: "master"
147175
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
148-
custom-requirements: requirements/requirements_dev.txt
149-
custom-wheels: './dpf-standalone/v232/dist'
176+
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
177+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
150178
secrets: inherit

‎.github/workflows/ci_release.yml‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ on:
66
- "v*"
77
schedule:
88
- cron: "0 13 * * 0"
9+
workflow_dispatch:
10+
inputs:
11+
standalone_branch_suffix:
12+
description: 'Suffix of the branch on standalone'
13+
required: false
14+
default: '.pre1'
915

1016
#┌───────────── minute (0 - 59)
1117
#│ ┌───────────── hour (0 - 23)
@@ -38,7 +44,7 @@ jobs:
3844
- uses: actions/checkout@v3
3945

4046
- name: "Setup Python"
41-
uses: actions/setup-python@v4
47+
uses: actions/setup-python@v4.6.0
4248
with:
4349
python-version: ${{ env.MAIN_PYTHON_VERSION }}
4450

@@ -55,14 +61,14 @@ jobs:
5561
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
5662
wheel: true
5763
wheelhouse: true
58-
standalone_suffix: ".pre0"
64+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
5965
secrets: inherit
6066

6167
docs:
6268
uses: ./.github/workflows/docs.yml
6369
with:
6470
ANSYS_VERSION: "232"
65-
standalone_suffix: ".pre0"
71+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
6672
event_name: ${{ github.event_name }}
6773
secrets: inherit
6874

@@ -71,7 +77,7 @@ jobs:
7177
with:
7278
ANSYS_VERSION: "232"
7379
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
74-
standalone_suffix: ".pre0"
80+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
7581
secrets: inherit
7682

7783
retro_231:
@@ -106,7 +112,7 @@ jobs:
106112
uses: ./.github/workflows/pydpf-post.yml
107113
with:
108114
ANSYS_VERSION: "232"
109-
standalone_suffix: ".pre0"
115+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
110116
secrets: inherit
111117

112118
pydpf-post_231:
@@ -134,14 +140,23 @@ jobs:
134140
name: "gate"
135141
uses: ./.github/workflows/gate.yml
136142
with:
137-
standalone_suffix: ".pre0"
143+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
138144
secrets: inherit
139145

140146
docker_tests:
141147
name: "Build and Test on Docker"
142148
uses: ./.github/workflows/test_docker.yml
143149
with:
144-
standalone_suffix: ".pre0"
150+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
151+
secrets: inherit
152+
153+
docker_examples:
154+
name: "Run examples on Docker"
155+
uses: ./.github/workflows/examples_docker.yml
156+
with:
157+
ANSYS_VERSION: "232"
158+
python_versions: '["3.8", "3.9", "3.10"]'
159+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
145160
secrets: inherit
146161

147162
draft_release:
@@ -151,7 +166,7 @@ jobs:
151166
runs-on: ubuntu-latest
152167
steps:
153168
- name: "Set up Python"
154-
uses: actions/setup-python@v4.1.0
169+
uses: actions/setup-python@v4.6.0
155170
with:
156171
python-version: 3.9
157172

‎.github/workflows/docs.yml‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -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"
@@ -171,21 +171,14 @@ jobs:
171171
if: always()
172172

173173
- name: "Zip HTML Documentation"
174-
uses: vimtor/action-zip@v1
175-
with:
176-
files: docs/build/html
177-
dest: HTML-doc-${{env.PACKAGE_NAME}}.zip
178-
if: always()
179-
180-
- name: "Upload HTML Documentation"
181-
uses: actions/upload-artifact@v3
182-
with:
183-
name: HTML-doc-${{env.PACKAGE_NAME}}
184-
path: HTML-doc-${{env.PACKAGE_NAME}}.zip
174+
shell: pwsh
175+
run: |
176+
Compress-Archive -Path docs/build/html/* -Destination HTML-doc-${{env.PACKAGE_NAME}}.zip
185177
if: always()
186178

187179
- name: "Upload HTML Documentation"
188180
uses: actions/upload-artifact@v3
189181
with:
190-
name: documentation-html
182+
name: HTML-doc-${{env.PACKAGE_NAME}}.zip
191183
path: docs/build/html
184+
if: always()

‎.github/workflows/examples.yml‎

Lines changed: 6 additions & 6 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.7"]'
10+
default: '["3.8"]'
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
@@ -34,7 +34,7 @@ on:
3434
description: "Python interpreters to test."
3535
required: true
3636
type: string
37-
default: '["3.7"]'
37+
default: '["3.8"]'
3838
ANSYS_VERSION:
3939
description: "ANSYS version to run."
4040
required: true
@@ -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)