Skip to content

Commit b3b82b8

Browse files
RobPasMueRobPasMue
authored
Merge branch 'main' into feat/track_boolean_operations
2 parents aacd11a + 32797ba commit b3b82b8

Some content is hidden

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

58 files changed

+841
-113
lines changed

‎.github/workflows/backwards_compatibility.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,14 @@ jobs:
4242
backend-version: "24.1"
4343
- image-tag: "windows-24.2"
4444
backend-version: "24.2"
45-
- image-tag: "windows-25.1"
46-
backend-version: "25.1"
45+
# TODO: This has to be reverted once the issue with 25.1 has been solved
46+
# https://github.com/ansys/pyansys-geometry/issues/2167
47+
# - image-tag: "windows-25.1"
48+
# backend-version: "25.1"
4749
- image-tag: "core-windows-25.2"
4850
backend-version: "25.2"
4951
steps:
50-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
52+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5153

5254
- name: Set up Python
5355
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -70,7 +72,7 @@ jobs:
7072
pip install .[tests]
7173
7274
- name: Login to GitHub Container Registry
73-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
75+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
7476
with:
7577
registry: ghcr.io
7678
username: ${{ github.actor }}
@@ -99,6 +101,7 @@ jobs:
99101
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
100102
101103
- name: Testing
104+
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
102105
run: |
103106
.\.venv\Scripts\Activate.ps1
104107
pytest -v --backwards-compatibility=yes --backend-version=${{ matrix.backend-version }} -rf

‎.github/workflows/ci_cd.yml‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
contents: write
4040
pull-requests: write
4141
steps:
42-
- uses: ansys/actions/doc-deploy-changelog@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
42+
- uses: ansys/actions/doc-deploy-changelog@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
4343
with:
4444
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
4545
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
@@ -49,7 +49,7 @@ jobs:
4949
name: Vulnerabilities
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: ansys/actions/check-vulnerabilities@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
52+
- uses: ansys/actions/check-vulnerabilities@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
5353
with:
5454
python-version: ${{ env.MAIN_PYTHON_VERSION }}
5555
python-package-name: ${{ env.PACKAGE_NAME }}
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-latest
6363
steps:
6464
- name: Check commit name
65-
uses: ansys/actions/check-pr-title@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
65+
uses: ansys/actions/check-pr-title@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
6666
with:
6767
token: ${{ secrets.GITHUB_TOKEN }}
6868

@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
steps:
7373
- name: PyAnsys documentation style checks
74-
uses: ansys/actions/doc-style@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
74+
uses: ansys/actions/doc-style@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
7575
with:
7676
token: ${{ secrets.GITHUB_TOKEN }}
7777

@@ -90,7 +90,7 @@ jobs:
9090
os: macos-latest
9191
steps:
9292
- name: Build wheelhouse and perform smoke test
93-
uses: ansys/actions/build-wheelhouse@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
93+
uses: ansys/actions/build-wheelhouse@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
9494
with:
9595
library-name: ${{ env.PACKAGE_NAME }}
9696
operating-system: ${{ matrix.os }}
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: ubuntu-latest
103103
steps:
104104
- name: PyAnsys documentation style checks
105-
uses: ansys/actions/docker-style@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
105+
uses: ansys/actions/docker-style@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
106106
with:
107107
directory: docker
108108
recursive: true
@@ -126,7 +126,7 @@ jobs:
126126
service-name: "Linux Core Service"
127127
steps:
128128
- name: Login to GitHub Container Registry
129-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
129+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
130130
with:
131131
registry: ghcr.io
132132
username: ${{ github.actor }}
@@ -195,7 +195,7 @@ jobs:
195195
Write-Output "SKIP_UNSTABLE=$Result" | Out-File -FilePath $env:GITHUB_ENV -Append
196196
Write-Output "SKIP_UNSTABLE will be: $Result"
197197
198-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
198+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
199199
if: env.SKIP_UNSTABLE == 'false'
200200

201201
- name: Set up Python
@@ -224,7 +224,7 @@ jobs:
224224
225225
- name: Login to GitHub Container Registry
226226
if: env.SKIP_UNSTABLE == 'false'
227-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
227+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
228228
with:
229229
registry: ghcr.io
230230
username: ${{ github.actor }}
@@ -256,14 +256,15 @@ jobs:
256256
257257
- name: Restore images cache
258258
if: env.SKIP_UNSTABLE == 'false'
259-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
259+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
260260
with:
261261
path: .\tests\integration\image_cache
262262
key: pyvista-image-cache-${{ runner.name }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
263263
restore-keys: pyvista-image-cache-${{ runner.name }}-v-${{ env.RESET_IMAGE_CACHE }}
264264

265265
- name: Testing
266266
if: env.SKIP_UNSTABLE == 'false'
267+
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
267268
run: |
268269
.\.venv\Scripts\Activate.ps1
269270
pytest -v
@@ -333,7 +334,7 @@ jobs:
333334
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
334335

335336
- name: Login to GitHub Container Registry
336-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
337+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
337338
with:
338339
registry: ghcr.io
339340
username: ${{ github.actor }}
@@ -345,7 +346,7 @@ jobs:
345346
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE_DOCS_TAG }}
346347
347348
- name: Run Ansys documentation building action
348-
uses: ansys/actions/doc-build@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
349+
uses: ansys/actions/doc-build@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
349350
with:
350351
python-version: ${{ env.MAIN_PYTHON_VERSION }}
351352
add-pdf-html-docs-as-assets: true
@@ -405,7 +406,7 @@ jobs:
405406

406407
- name: Login in Github Container registry
407408
if: env.SKIP_UNSTABLE == 'false'
408-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
409+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
409410
with:
410411
registry: ghcr.io
411412
username: ${{ github.actor }}
@@ -419,19 +420,19 @@ jobs:
419420
420421
- name: Checkout repository
421422
if: env.SKIP_UNSTABLE == 'false'
422-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
423+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
423424

424425
- name: Restore images cache
425426
if: env.SKIP_UNSTABLE == 'false'
426-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
427+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
427428
with:
428429
path: tests/integration/image_cache
429430
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
430431
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
431432

432433
- name: Run pytest
433434
if: env.SKIP_UNSTABLE == 'false'
434-
uses: ansys/actions/tests-pytest@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
435+
uses: ansys/actions/tests-pytest@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
435436
env:
436437
ALLOW_PLOTTING: true
437438
with:
@@ -488,14 +489,14 @@ jobs:
488489
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
489490

490491
- name: Login in Github Container registry
491-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
492+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
492493
with:
493494
registry: ghcr.io
494495
username: ${{ github.actor }}
495496
password: ${{ secrets.GITHUB_TOKEN }}
496497

497498
- name: Checkout repository
498-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
499+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
499500

500501
- name: Setup Python ${{ matrix.python-version }}
501502
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -540,14 +541,14 @@ jobs:
540541
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
541542

542543
- name: Login in Github Container registry
543-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
544+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
544545
with:
545546
registry: ghcr.io
546547
username: ${{ github.actor }}
547548
password: ${{ secrets.GITHUB_TOKEN }}
548549

549550
- name: Checkout repository
550-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
551+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
551552

552553
- name: Setup Python ${{ matrix.python-version }}
553554
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -589,14 +590,14 @@ jobs:
589590
python-version: ['3.10', '3.13']
590591
steps:
591592
- name: Login in Github Container registry
592-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
593+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
593594
with:
594595
registry: ghcr.io
595596
username: ${{ github.actor }}
596597
password: ${{ secrets.GITHUB_TOKEN }}
597598

598599
- name: Checkout repository
599-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
600+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
600601

601602
- name: Setup Python ${{ matrix.python-version }}
602603
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -639,7 +640,7 @@ jobs:
639640
id-token: write
640641
steps:
641642
- name: Build library source and wheel artifacts
642-
uses: ansys/actions/build-library@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
643+
uses: ansys/actions/build-library@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
643644
with:
644645
library-name: ${{ env.PACKAGE_NAME }}
645646
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -661,7 +662,7 @@ jobs:
661662

662663
steps:
663664
- name: Check out repository pyansys-geometry-binaries
664-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
665+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
665666
with:
666667
repository: 'ansys/pyansys-geometry-binaries'
667668
token: ${{ secrets.BINARIES_TOKEN }}
@@ -734,7 +735,7 @@ jobs:
734735
zip-file: "windows-core-binaries.zip"
735736
steps:
736737
- name: Checkout repository
737-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
738+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
738739

739740
- name: Set up headless display
740741
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
@@ -745,7 +746,7 @@ jobs:
745746
python-version: ${{ env.MAIN_PYTHON_VERSION }}
746747

747748
- name: Download Windows binaries for ${{ matrix.mode }}
748-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
749+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
749750
with:
750751
name: ${{ matrix.zip-file }}
751752
path: docker/${{ matrix.zip-file }}
@@ -768,7 +769,7 @@ jobs:
768769
pip install -e .[tests]
769770
770771
- name: Restore images cache
771-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
772+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
772773
with:
773774
path: .\tests\integration\image_cache
774775
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
@@ -781,6 +782,7 @@ jobs:
781782
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
782783
783784
- name: Testing
785+
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
784786
run: |
785787
.\.venv\Scripts\Activate.ps1
786788
pytest -v --use-existing-service=yes
@@ -830,7 +832,7 @@ jobs:
830832
needs: [fetch-release-artifacts]
831833
steps:
832834
- name: Checkout repository
833-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
835+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
834836

835837
- name: Set up Python
836838
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
@@ -841,7 +843,7 @@ jobs:
841843
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
842844

843845
- name: Download Linux binaries
844-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
846+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
845847
with:
846848
name: linux-core-binaries.zip
847849
path: docker/linux-core-binaries.zip
@@ -862,14 +864,14 @@ jobs:
862864
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
863865
864866
- name: Restore images cache
865-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
867+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
866868
with:
867869
path: .\tests\integration\image_cache
868870
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
869871
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
870872

871873
- name: Run pytest
872-
uses: ansys/actions/tests-pytest@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
874+
uses: ansys/actions/tests-pytest@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
873875
env:
874876
ALLOW_PLOTTING: true
875877
with:
@@ -910,7 +912,7 @@ jobs:
910912
contents: write
911913
steps:
912914
- name: Release to GitHub
913-
uses: ansys/actions/release-github@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
915+
uses: ansys/actions/release-github@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
914916
with:
915917
token: ${{ secrets.GITHUB_TOKEN }}
916918
library-name: ${{ env.PACKAGE_NAME }}
@@ -930,7 +932,7 @@ jobs:
930932
contents: write
931933
steps:
932934
- name: "Download the library artifacts from build-library step"
933-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
935+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
934936
with:
935937
name: ${{ env.PACKAGE_NAME }}-artifacts
936938
path: ${{ env.PACKAGE_NAME }}-artifacts
@@ -950,7 +952,7 @@ jobs:
950952
needs: [package]
951953
steps:
952954
- name: Deploy the latest documentation
953-
uses: ansys/actions/doc-deploy-dev@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
955+
uses: ansys/actions/doc-deploy-dev@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
954956
with:
955957
cname: ${{ env.DOCUMENTATION_CNAME }}
956958
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -964,7 +966,7 @@ jobs:
964966
needs: [release, release-pypi]
965967
steps:
966968
- name: Deploy the stable documentation
967-
uses: ansys/actions/doc-deploy-stable@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
969+
uses: ansys/actions/doc-deploy-stable@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
968970
with:
969971
cname: ${{ env.DOCUMENTATION_CNAME }}
970972
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -981,7 +983,7 @@ jobs:
981983
pull-requests: write
982984
steps:
983985
- name: Automerge PRs
984-
uses: ansys/actions/hk-automerge-prs@2031be5b84d9f8c1d56a54912209aa489b469a0f # v10.0.13
986+
uses: ansys/actions/hk-automerge-prs@1096998b81f7ebdea116b683e11f3a8bda759ca6 # v10.0.14
985987
with:
986988
approver: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
987989
approver-token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ jobs:
1919
security-events: write
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
25+
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
2626
with:
2727
languages: 'python'
2828
config-file: ./.github/codeql-config.yml
2929

3030
- name: Autobuild
31-
uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
31+
uses: github/codeql-action/autobuild@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
3232

3333
# If the Autobuild fails above, remove it and uncomment the following three lines.
3434
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
@@ -38,6 +38,6 @@ jobs:
3838
# ./location_of_script_within_repo/buildscript.sh
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
41+
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
4242
with:
4343
category: "/language:python"

0 commit comments

Comments
 (0)