Skip to content

Commit 38975ec

Browse files
RobPasMueRobPasMue
authored
Merge branch 'main' into fix/export-facets
2 parents fcc42a7 + de8df27 commit 38975ec

Some content is hidden

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

46 files changed

+218
-89
lines changed

‎.github/workflows/backwards_compatibility.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: Check location of self-hosted runner and define license server accordingly
8383
if: runner.name == 'pygeometry-ci-2'
8484
run:
85-
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
85+
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.LICENSE_SERVER_INTERNAL }}" | Out-File -FilePath $env:GITHUB_ENV -Append
8686

8787
- name: Stop any running containers
8888
run: |
@@ -95,7 +95,8 @@ jobs:
9595
- name: Start Geometry service and verify start
9696
run: |
9797
.\.venv\Scripts\Activate.ps1
98-
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 }}:${{ matrix.image-tag }}
98+
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 }}:${{ matrix.image-tag }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
99+
Start-Sleep -Seconds 10
99100
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
100101
101102
- name: Testing

‎.github/workflows/ci_cd.yml‎

Lines changed: 24 additions & 24 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@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
42+
- uses: ansys/actions/doc-deploy-changelog@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
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@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
52+
- uses: ansys/actions/check-vulnerabilities@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
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@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
65+
uses: ansys/actions/check-pr-title@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
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@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
74+
uses: ansys/actions/doc-style@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
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@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
93+
uses: ansys/actions/build-wheelhouse@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
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@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
105+
uses: ansys/actions/docker-style@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
106106
with:
107107
directory: docker
108108
recursive: true
@@ -237,7 +237,7 @@ jobs:
237237
- name: Check location of self-hosted runner and define license server accordingly
238238
if: env.SKIP_UNSTABLE == 'false' && runner.name == 'pygeometry-ci-2'
239239
run:
240-
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
240+
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.LICENSE_SERVER_INTERNAL }}" | Out-File -FilePath $env:GITHUB_ENV -Append
241241

242242
- name: Stop any running containers
243243
run: |
@@ -251,7 +251,7 @@ jobs:
251251
if: env.SKIP_UNSTABLE == 'false'
252252
run: |
253253
.\.venv\Scripts\Activate.ps1
254-
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 }}:${{ matrix.docker-image }}
254+
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 }}:${{ matrix.docker-image }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
255255
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
256256
257257
- name: Restore images cache
@@ -343,10 +343,10 @@ jobs:
343343
- name: Pull and launch geometry service
344344
run: |
345345
docker pull ${{ env.ANSRV_GEO_IMAGE_DOCS_TAG }}
346-
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 }}
346+
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 }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
347347
348348
- name: Run Ansys documentation building action
349-
uses: ansys/actions/doc-build@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
349+
uses: ansys/actions/doc-build@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
350350
with:
351351
python-version: ${{ env.MAIN_PYTHON_VERSION }}
352352
add-pdf-html-docs-as-assets: true
@@ -416,7 +416,7 @@ jobs:
416416
if: env.SKIP_UNSTABLE == 'false'
417417
run: |
418418
docker pull ${{ env.ANSRV_GEO_IMAGE }}:${{ matrix.docker-image }}
419-
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 }}:${{ matrix.docker-image }}
419+
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 }}:${{ matrix.docker-image }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
420420
421421
- name: Checkout repository
422422
if: env.SKIP_UNSTABLE == 'false'
@@ -432,7 +432,7 @@ jobs:
432432

433433
- name: Run pytest
434434
if: env.SKIP_UNSTABLE == 'false'
435-
uses: ansys/actions/tests-pytest@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
435+
uses: ansys/actions/tests-pytest@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
436436
env:
437437
ALLOW_PLOTTING: true
438438
with:
@@ -512,7 +512,7 @@ jobs:
512512
- name: Start Geometry service and verify start
513513
run: |
514514
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
515-
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_MINREQS }}
515+
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_MINREQS }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
516516
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
517517
518518
- name: Run pytest
@@ -564,7 +564,7 @@ jobs:
564564
- name: Start Geometry service and verify start
565565
run: |
566566
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
567-
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_MINREQS }}
567+
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_MINREQS }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
568568
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
569569
570570
- name: Run pytest
@@ -616,7 +616,7 @@ jobs:
616616
- name: Start Geometry service and verify start
617617
run: |
618618
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
619-
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_MINREQS }}
619+
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_MINREQS }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
620620
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
621621
622622
- name: Run pytest
@@ -640,7 +640,7 @@ jobs:
640640
id-token: write
641641
steps:
642642
- name: Build library source and wheel artifacts
643-
uses: ansys/actions/build-library@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
643+
uses: ansys/actions/build-library@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
644644
with:
645645
library-name: ${{ env.PACKAGE_NAME }}
646646
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -759,7 +759,7 @@ jobs:
759759
- name: Check location of self-hosted runner and define license server accordingly
760760
if: runner.name == 'pygeometry-ci-2'
761761
run:
762-
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
762+
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.LICENSE_SERVER_INTERNAL }}" | Out-File -FilePath $env:GITHUB_ENV -Append
763763

764764
- name: Validate connection using PyAnsys Geometry
765765
run: |
@@ -778,7 +778,7 @@ jobs:
778778
- name: Start Geometry service and verify start
779779
run: |
780780
.\.venv\Scripts\Activate.ps1
781-
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:windows-tmp
781+
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:windows-tmp ${{ secrets.TRANSPORT_MODE_SELECTION }}
782782
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
783783
784784
- name: Testing
@@ -860,7 +860,7 @@ jobs:
860860
861861
- name: Start Geometry service and verify start
862862
run: |
863-
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:linux-tmp
863+
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:linux-tmp ${{ secrets.TRANSPORT_MODE_SELECTION }}
864864
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
865865
866866
- name: Restore images cache
@@ -871,7 +871,7 @@ jobs:
871871
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
872872

873873
- name: Run pytest
874-
uses: ansys/actions/tests-pytest@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
874+
uses: ansys/actions/tests-pytest@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
875875
env:
876876
ALLOW_PLOTTING: true
877877
with:
@@ -912,7 +912,7 @@ jobs:
912912
contents: write
913913
steps:
914914
- name: Release to GitHub
915-
uses: ansys/actions/release-github@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
915+
uses: ansys/actions/release-github@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
916916
with:
917917
token: ${{ secrets.GITHUB_TOKEN }}
918918
library-name: ${{ env.PACKAGE_NAME }}
@@ -952,7 +952,7 @@ jobs:
952952
needs: [package]
953953
steps:
954954
- name: Deploy the latest documentation
955-
uses: ansys/actions/doc-deploy-dev@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
955+
uses: ansys/actions/doc-deploy-dev@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
956956
with:
957957
cname: ${{ env.DOCUMENTATION_CNAME }}
958958
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -966,7 +966,7 @@ jobs:
966966
needs: [release, release-pypi]
967967
steps:
968968
- name: Deploy the stable documentation
969-
uses: ansys/actions/doc-deploy-stable@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
969+
uses: ansys/actions/doc-deploy-stable@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
970970
with:
971971
cname: ${{ env.DOCUMENTATION_CNAME }}
972972
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -983,7 +983,7 @@ jobs:
983983
pull-requests: write
984984
steps:
985985
- name: Automerge PRs
986-
uses: ansys/actions/hk-automerge-prs@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
986+
uses: ansys/actions/hk-automerge-prs@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
987987
with:
988988
approver: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
989989
approver-token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}

‎.github/workflows/docker_cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323

2424
- name: "Perform versions cleanup - except certain tags"
25-
uses: ansys/actions/hk-package-clean-except@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
25+
uses: ansys/actions/hk-package-clean-except@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
2626
with:
2727
package-name: 'geometry'
2828
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
pull-requests: write
107107
runs-on: ubuntu-latest
108108
steps:
109-
- uses: ansys/actions/doc-changelog@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
109+
- uses: ansys/actions/doc-changelog@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
110110
with:
111111
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
112112
use-conventional-commits: true

‎.github/workflows/nightly_docker_test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ jobs:
132132
- name: Check location of self-hosted runner and define license server accordingly
133133
if: runner.name == 'pygeometry-ci-2'
134134
run:
135-
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
135+
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.LICENSE_SERVER_INTERNAL }}" | Out-File -FilePath $env:GITHUB_ENV -Append
136136

137137
- name: Start Geometry service and verify start
138138
run: |
139139
.\.venv\Scripts\Activate.ps1
140-
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_WINDOWS_CORE_TAG }}
140+
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_WINDOWS_CORE_TAG }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
141141
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
142142
143143
- name: Run PyAnsys Geometry tests
@@ -215,13 +215,13 @@ jobs:
215215
- name: Pull and launch geometry service
216216
run: |
217217
docker pull ${{ env.ANSRV_GEO_IMAGE_LINUX_CORE_TAG }}
218-
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_LINUX_CORE_TAG }}
218+
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_LINUX_CORE_TAG }} ${{ secrets.TRANSPORT_MODE_SELECTION }}
219219
220220
- name: Set up headless display
221221
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
222222

223223
- name: Run pytest
224-
uses: ansys/actions/tests-pytest@ed773aba3478d311decff2d4313e0cd19a945dd8 # v10.1.0
224+
uses: ansys/actions/tests-pytest@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
225225
env:
226226
ALLOW_PLOTTING: true
227227
with:

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exclude: "tests/integration/files"
77
repos:
88

99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: v0.13.0
10+
rev: v0.13.1
1111
hooks:
1212
- id: ruff-check
1313
- id: ruff-format
@@ -35,7 +35,7 @@ repos:
3535

3636
# this validates our github workflow files
3737
- repo: https://github.com/python-jsonschema/check-jsonschema
38-
rev: 0.33.3
38+
rev: 0.34.0
3939
hooks:
4040
- id: check-github-workflows
4141

‎doc/changelog.d/2157.test.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎doc/changelog.d/2185.maintenance.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎doc/changelog.d/2193.test.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎doc/changelog.d/2197.maintenance.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)