Skip to content

Commit 1147ac3

Browse files
authored
Merge branch 'main' into AnsMelanie/op-doc/update-description
2 parents 755c67d + 1e18868 commit 1147ac3

File tree

98 files changed

+9761
-1424
lines changed

Some content is hidden

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

98 files changed

+9761
-1424
lines changed

.ci/generate_operators_doc.py

Lines changed: 0 additions & 229 deletions
This file was deleted.

.github/workflows/doc-deploy-pr.yml

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ name: doc-deploy-PR
22

33
on:
44
workflow_run:
5-
workflows: [docs]
5+
workflows: [ci]
66
types: [completed]
7+
pull_request:
8+
types: [closed]
79

810
env:
911
DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
@@ -20,27 +22,48 @@ jobs:
2022
name: "Deploy PR documentation"
2123
runs-on: ubuntu-latest
2224
if: |
23-
github.event.workflow_run.conclusion == 'success' &&
24-
contains(github.event.workflow_run.pull_requests.*.labels.*.name, 'deploy-pr-doc')
25+
(
26+
github.event_name == 'workflow_run' &&
27+
github.event.workflow_run.conclusion == 'success' &&
28+
contains(github.event.workflow_run.pull_requests.*.labels.*.name, 'deploy-pr-doc')
29+
) || (
30+
github.event_name == 'pull_request' &&
31+
github.event.action == 'closed' &&
32+
contains(github.event.pull_request.labels.*.name, 'deploy-pr-doc')
33+
)
2534
steps:
26-
- name: "Download artifacts"
35+
- name: Set PR number
36+
id: pr
37+
run: |
38+
if [[ "${{ github.event_name }}" == "workflow_run" ]]; then
39+
echo "pr_number=${{ fromJson(toJson(github.event.workflow_run.pull_requests[0])).number }}" >> "$GITHUB_OUTPUT"
40+
else
41+
echo "pr_number=${{ github.event.pull_request.number }}" >> "$GITHUB_OUTPUT"
42+
fi
43+
44+
- name: Print PR number
45+
run: echo "PR number is ${{ steps.pr.outputs.pr_number }}"
46+
47+
- name: Download artifacts (if workflow_run)
48+
if: ${{ github.event_name == 'workflow_run' }}
2749
uses: dawidd6/action-download-artifact@v11
2850
with:
2951
workflow: docs.yml
3052
name: HTML-doc-ansys-dpf-core.zip
3153
github_token: ${{ secrets.GITHUB_TOKEN }}
3254
run_id: ${{ github.event.workflow_run.id }}
3355

34-
35-
- name: "Display downloaded files"
56+
- name: Display downloaded files (if workflow_run)
57+
if: ${{ github.event_name == 'workflow_run' }}
3658
run: ls -R
3759

38-
- uses: ansys/actions/doc-deploy-pr@v10
60+
- name: Deploy PR documentation
61+
uses: ansys/actions/doc-deploy-pr@v10
3962
with:
4063
cname: ${{ env.DOCUMENTATION_CNAME }}
4164
token: ${{ secrets.GITHUB_TOKEN }}
4265
doc-artifact-name: HTML-doc-ansys-dpf-core.zip
4366
decompress-artifact: true
4467
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
4568
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
46-
maximum-pr-doc-deployments: 10
69+
maximum-pr-doc-deployments: 10

.github/workflows/pydpf-post.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
echo branch="$BranchName"
123123
if [ "$BranchName" = '' ];
124124
then
125-
BranchName=$(git ls-remote --tags --refs $REPO | tail -n1 | cut -d/ -f3)
125+
BranchName=$(git ls-remote --tags --sort="v:refname" --refs $REPO | tail -n1 | cut -d/ -f3)
126126
fi
127127
echo branch=$BranchName
128128
git clone --single-branch --branch "$BranchName" $REPO

.github/workflows/scripts/separate_long_core_tests.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ New-Item -Path ".\" -Name "test_remote_workflow" -ItemType "directory"
77
New-Item -Path ".\" -Name "test_remote_operator" -ItemType "directory"
88
New-Item -Path ".\" -Name "test_service" -ItemType "directory"
99
New-Item -Path ".\" -Name "test_custom_type_field" -ItemType "directory"
10+
New-Item -Path ".\" -Name "test_documentation" -ItemType "directory"
1011
Copy-Item -Path "tests\conftest.py" -Destination ".\test_launcher\"
1112
Copy-Item -Path "tests\conftest.py" -Destination ".\test_server\"
1213
Copy-Item -Path "tests\conftest.py" -Destination ".\test_local_server\"
@@ -16,6 +17,7 @@ Copy-Item -Path "tests\conftest.py" -Destination ".\test_remote_workflow\"
1617
Copy-Item -Path "tests\conftest.py" -Destination ".\test_remote_operator\"
1718
Copy-Item -Path "tests\conftest.py" -Destination ".\test_service\"
1819
Copy-Item -Path "tests\conftest.py" -Destination ".\test_custom_type_field\"
20+
Copy-Item -Path "tests\conftest.py" -Destination ".\test_documentation\"
1921
Copy-Item -Path "tests\test_launcher.py" -Destination ".\test_launcher\"
2022
Copy-Item -Path "tests\test_server.py" -Destination ".\test_server\"
2123
Copy-Item -Path "tests\test_local_server.py" -Destination ".\test_local_server\"
@@ -25,6 +27,7 @@ Copy-Item -Path "tests\test_remote_workflow.py" -Destination ".\test_remote_work
2527
Copy-Item -Path "tests\test_remote_operator.py" -Destination ".\test_remote_operator\"
2628
Copy-Item -Path "tests\test_service.py" -Destination ".\test_service\"
2729
Copy-Item -Path "tests\test_custom_type_field.py" -Destination ".\test_custom_type_field\"
30+
Copy-Item -Path "tests\test_documentation.py" -Destination ".\test_documentation\"
2831
Remove-Item -Path "tests\test_server.py"
2932
Remove-Item -Path "tests\test_launcher.py"
3033
Remove-Item -Path "tests\test_local_server.py"
@@ -33,4 +36,5 @@ Remove-Item -Path "tests\test_workflow.py"
3336
Remove-Item -Path "tests\test_remote_workflow.py"
3437
Remove-Item -Path "tests\test_remote_operator.py"
3538
Remove-Item -Path "tests\test_service.py"
36-
Remove-Item -Path "tests\test_custom_type_field.py"
39+
Remove-Item -Path "tests\test_custom_type_field.py"
40+
Remove-Item -Path "tests\test_documentation.py"

.github/workflows/test_docker.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,15 @@ jobs:
205205
command: |
206206
pytest $DEBUG $COVERAGE $RERUNS --junitxml=../tests/junit/test-results12.xml tests/operators/.
207207
208+
- name: "Test Documentation"
209+
uses: nick-fields/retry@v3
210+
with:
211+
timeout_minutes: 4
212+
max_attempts: 2
213+
shell: bash
214+
command: |
215+
pytest $DEBUG $COVERAGE $RERUNS --junitxml=../tests/junit/test-results13.xml test_documentation/.
216+
208217
# - name: "Test API Entry"
209218
# shell: bash
210219
# working-directory: tests

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* [Jose Armando Henriquez Roa](https://github.com/jose-henriquez-roa)
3636
* [jose-henriquezroa](https://github.com/jose-henriquezroa)
3737
* [Joshua Fairchild](https://github.com/joshuafairch)
38+
* [Josip Vidal Orlovac](https://github.com/jvidalor)
3839
* [jviqueg](https://github.com/jviqueg)
3940
* [Kathy Pippert](https://github.com/PipKat)
4041
* [kmahajan-cadfem](https://github.com/kmahajan-cadfem)

SECURITY.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Reporting a vulnerability
2+
3+
> [!CAUTION]
4+
> Do not use GitHub issues to report any security vulnerabilities.
5+
6+
If you detect a vulnerability, contact the [PyAnsys Core team](mailto:[email protected]),
7+
mentioning the repository and the details of your finding. The team will address it as soon as possible.
8+
9+
Provide the PyAnsys Core team with this information:
10+
11+
- Any specific configuration settings needed to reproduce the problem
12+
- Step-by-step guidance to reproduce the problem
13+
- The exact location of the problematic source code, including tag, branch, commit, or a direct URL
14+
- The potential consequences of the vulnerability, along with a description of how an attacker could take advantage of the issue

0 commit comments

Comments
 (0)