Skip to content

Commit 536eccc

Browse files
authored
Merge branch 'main' into dependabot/pip/requirements/pyvista-0.46.3
2 parents 95430c7 + c125927 commit 536eccc

File tree

104 files changed

+3655
-760
lines changed

Some content is hidden

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

104 files changed

+3655
-760
lines changed

.ci/generate_operators_doc.py

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

.github/workflows/ci.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -206,39 +206,3 @@ jobs:
206206
DOCSTRING: false
207207
standalone_suffix: ${{ matrix.version == '241' && '.sp01' || '' }}
208208
secrets: inherit
209-
210-
sync-main-with-master:
211-
name: "Sync main with master"
212-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
213-
runs-on: ubuntu-latest
214-
steps:
215-
- name: "Install Git and clone project"
216-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
217-
with:
218-
token: ${{ secrets.MIGRATION_PAT }}
219-
fetch-depth: 0
220-
221-
- name: "Verify that main is the default branch"
222-
shell: bash
223-
run: |
224-
head_branch=$(git remote show origin | grep "HEAD branch:")
225-
main_branch=${head_branch#*: }
226-
227-
if [[ $main_branch != "main" ]]; then
228-
echo "The default branch is not 'main'. It is set to '$main_branch'."
229-
echo "Please set 'main' as the default branch in the repository settings."
230-
exit 1
231-
fi
232-
233-
- name: "Configure git username and email"
234-
shell: bash
235-
run: |
236-
git config --global user.name "${{ secrets.PYANSYS_CI_BOT_USERNAME }}"
237-
git config --global user.email "${{ secrets.PYANSYS_CI_BOT_EMAIL }}"
238-
239-
- name: "Sync main to master"
240-
shell: bash
241-
run: |
242-
git checkout master
243-
git reset --hard main
244-
git push

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: "Build the wheel"
8080
shell: pwsh
8181
run: |
82-
tox -e build-wheel
82+
tox -e build-wheel -- "any"
8383
8484
- name: "Expose the wheel"
8585
shell: bash

.github/workflows/pydpf-post.yml

Lines changed: 2 additions & 2 deletions
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
@@ -152,7 +152,7 @@ jobs:
152152
PACKAGE_NAME: ansys-dpf-post
153153
working-directory: pydpf-post/src
154154
if: inputs.test_docstrings == 'true'
155-
timeout-minutes: 10
155+
timeout-minutes: 12
156156
continue-on-error: true
157157

158158
- uses: mainmatter/continue-on-error-comment@v1

.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: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
- name: "Test API test_server"
137137
uses: nick-fields/retry@v3
138138
with:
139-
timeout_minutes: 5
139+
timeout_minutes: 8
140140
max_attempts: 2
141141
shell: bash
142142
command: |
@@ -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: 8
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

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ jobs:
234234
- name: "Run compatible tests in parallel"
235235
uses: nick-fields/retry@v3
236236
with:
237-
timeout_minutes: 15
237+
timeout_minutes: 20
238238
max_attempts: 2
239239
shell: bash
240240
command: |

0 commit comments

Comments
 (0)