Skip to content

Commit 548d054

Browse files
Merge branch 'main' into feat/pull_commands
2 parents 9bb9fc5 + 7890c7d commit 548d054

20 files changed

+220
-23
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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,7 +343,7 @@ 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
349349
uses: ansys/actions/doc-build@e0de7dd89b2a4c100f74327666d5521cfda17950 # v10.1.1
@@ -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'
@@ -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
@@ -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

.github/workflows/nightly_docker_test.yml

Lines changed: 3 additions & 3 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,7 +215,7 @@ 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

.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/2232.added.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Helix detection
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump quarto-cli from 1.7.34 to 1.8.24
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump panel from 1.8.0 to 1.8.1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump vtk from 9.5.1 to 9.5.2
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump ansys-api-geometry from 0.4.75 to 0.4.76
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pre-commit automatic update

0 commit comments

Comments
 (0)