Skip to content

Commit a28047a

Browse files
jacobrkerstetterjacobrkerstetter
committed
Merge branch 'main' of https://github.com/ansys/pyansys-geometry into feat/driving_dimensions_stub_relocation
# Conflicts: # src/ansys/geometry/core/parameters/parameter.py
2 parents 69957c8 + 4630424 commit a28047a

28 files changed

+214
-143
lines changed

‎.github/workflows/ci_cd.yml‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- main
1010

1111
env:
12-
MAIN_PYTHON_VERSION: '3.12'
12+
MAIN_PYTHON_VERSION: '3.13'
1313
PACKAGE_NAME: 'ansys-geometry-core'
1414
DOCUMENTATION_CNAME: 'geometry.docs.pyansys.com'
1515
ANSRV_GEO_IMAGE: 'ghcr.io/ansys/geometry'
@@ -35,7 +35,7 @@ jobs:
3535
contents: write
3636
pull-requests: write
3737
steps:
38-
- uses: ansys/actions/doc-deploy-changelog@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
38+
- uses: ansys/actions/doc-deploy-changelog@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
3939
with:
4040
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
4141
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
@@ -45,7 +45,7 @@ jobs:
4545
name: Vulnerabilities
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: ansys/actions/check-vulnerabilities@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
48+
- uses: ansys/actions/check-vulnerabilities@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
4949
with:
5050
python-version: ${{ env.MAIN_PYTHON_VERSION }}
5151
python-package-name: ${{ env.PACKAGE_NAME }}
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-latest
5959
steps:
6060
- name: Check commit name
61-
uses: ansys/actions/check-pr-title@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
61+
uses: ansys/actions/check-pr-title@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
6262
with:
6363
token: ${{ secrets.GITHUB_TOKEN }}
6464

@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
steps:
6969
- name: PyAnsys documentation style checks
70-
uses: ansys/actions/doc-style@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
70+
uses: ansys/actions/doc-style@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
7171
with:
7272
token: ${{ secrets.GITHUB_TOKEN }}
7373

@@ -86,7 +86,7 @@ jobs:
8686
os: macos-latest
8787
steps:
8888
- name: Build wheelhouse and perform smoke test
89-
uses: ansys/actions/build-wheelhouse@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
89+
uses: ansys/actions/build-wheelhouse@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
9090
with:
9191
library-name: ${{ env.PACKAGE_NAME }}
9292
operating-system: ${{ matrix.os }}
@@ -98,7 +98,7 @@ jobs:
9898
runs-on: ubuntu-latest
9999
steps:
100100
- name: PyAnsys documentation style checks
101-
uses: ansys/actions/docker-style@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
101+
uses: ansys/actions/docker-style@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
102102
with:
103103
directory: docker
104104
recursive: true
@@ -160,7 +160,6 @@ jobs:
160160
continue-on-error: ${{ matrix.experimental }}
161161
env:
162162
SKIP_UNSTABLE: false
163-
PYVISTA_OFF_SCREEN: true
164163
strategy:
165164
fail-fast: false
166165
matrix:
@@ -203,9 +202,7 @@ jobs:
203202

204203
- name: Set up headless display
205204
if: env.SKIP_UNSTABLE == 'false'
206-
uses: pyvista/setup-headless-display-action@52bda06d59c0fc422fc2512c9c670bf6b66616f8 # v3.2
207-
with:
208-
pyvista: false
205+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
209206

210207
- name: Create Python venv
211208
if: env.SKIP_UNSTABLE == 'false'
@@ -323,11 +320,9 @@ jobs:
323320
name: Documentation
324321
needs: [docs-style]
325322
runs-on: ubuntu-latest
326-
env:
327-
PYVISTA_OFF_SCREEN: true
328323
steps:
329324
- name: Set up headless display
330-
uses: pyvista/setup-headless-display-action@52bda06d59c0fc422fc2512c9c670bf6b66616f8 # v3.2
325+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
331326

332327
- name: Login to GitHub Container Registry
333328
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -342,7 +337,7 @@ jobs:
342337
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 }}
343338
344339
- name: Run Ansys documentation building action
345-
uses: ansys/actions/doc-build@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
340+
uses: ansys/actions/doc-build@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
346341
with:
347342
python-version: ${{ env.MAIN_PYTHON_VERSION }}
348343
add-pdf-html-docs-as-assets: true
@@ -401,6 +396,10 @@ jobs:
401396
echo "SKIP_UNSTABLE=$Result" >> $GITHUB_ENV
402397
echo "SKIP_UNSTABLE will be: $Result"
403398
399+
- name: Set up headless display
400+
if: env.SKIP_UNSTABLE == 'false'
401+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
402+
404403
- name: Login in Github Container registry
405404
if: env.SKIP_UNSTABLE == 'false'
406405
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -429,7 +428,7 @@ jobs:
429428

430429
- name: Run pytest
431430
if: env.SKIP_UNSTABLE == 'false'
432-
uses: ansys/actions/tests-pytest@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
431+
uses: ansys/actions/tests-pytest@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
433432
env:
434433
ALLOW_PLOTTING: true
435434
with:
@@ -474,6 +473,9 @@ jobs:
474473
matrix:
475474
python-version: ['3.10', '3.11', '3.12', '3.13']
476475
steps:
476+
- name: Set up headless display
477+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
478+
477479
- name: Login in Github Container registry
478480
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
479481
with:
@@ -574,7 +576,7 @@ jobs:
574576
id-token: write
575577
steps:
576578
- name: Build library source and wheel artifacts
577-
uses: ansys/actions/build-library@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
579+
uses: ansys/actions/build-library@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
578580
with:
579581
library-name: ${{ env.PACKAGE_NAME }}
580582
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -671,6 +673,9 @@ jobs:
671673
- name: Checkout repository
672674
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
673675

676+
- name: Set up headless display
677+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
678+
674679
- name: Set up Python
675680
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
676681
with:
@@ -769,6 +774,9 @@ jobs:
769774
with:
770775
python-version: ${{ env.MAIN_PYTHON_VERSION }}
771776

777+
- name: Set up headless display
778+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
779+
772780
- name: Download Linux binaries
773781
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
774782
with:
@@ -798,14 +806,13 @@ jobs:
798806
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
799807

800808
- name: Run pytest
801-
uses: ansys/actions/tests-pytest@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
809+
uses: ansys/actions/tests-pytest@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
802810
env:
803811
ALLOW_PLOTTING: true
804812
with:
805813
python-version: ${{ env.MAIN_PYTHON_VERSION }}
806814
pytest-extra-args: "--use-existing-service=yes"
807815
checkout: false
808-
requires-xvfb: true
809816
randomize: true
810817

811818
- name: "Compressing Linux Dockerfile"
@@ -840,7 +847,7 @@ jobs:
840847
contents: write
841848
steps:
842849
- name: Release to GitHub
843-
uses: ansys/actions/release-github@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
850+
uses: ansys/actions/release-github@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
844851
with:
845852
token: ${{ secrets.GITHUB_TOKEN }}
846853
library-name: ${{ env.PACKAGE_NAME }}
@@ -880,7 +887,7 @@ jobs:
880887
needs: [package]
881888
steps:
882889
- name: Deploy the latest documentation
883-
uses: ansys/actions/doc-deploy-dev@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
890+
uses: ansys/actions/doc-deploy-dev@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
884891
with:
885892
cname: ${{ env.DOCUMENTATION_CNAME }}
886893
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -894,7 +901,7 @@ jobs:
894901
needs: [release, release-pypi]
895902
steps:
896903
- name: Deploy the stable documentation
897-
uses: ansys/actions/doc-deploy-stable@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
904+
uses: ansys/actions/doc-deploy-stable@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
898905
with:
899906
cname: ${{ env.DOCUMENTATION_CNAME }}
900907
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -911,7 +918,7 @@ jobs:
911918
pull-requests: write
912919
steps:
913920
- name: Automerge PRs
914-
uses: ansys/actions/hk-automerge-prs@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
921+
uses: ansys/actions/hk-automerge-prs@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
915922
with:
916923
approver: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
917924
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@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
25+
uses: ansys/actions/hk-package-clean-except@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
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
@@ -100,7 +100,7 @@ jobs:
100100
pull-requests: write
101101
runs-on: ubuntu-latest
102102
steps:
103-
- uses: ansys/actions/doc-changelog@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
103+
- uses: ansys/actions/doc-changelog@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
104104
with:
105105
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
106106
use-conventional-commits: true

‎.github/workflows/nightly_docker_test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- v*
2222

2323
env:
24-
MAIN_PYTHON_VERSION: '3.12'
24+
MAIN_PYTHON_VERSION: '3.13'
2525
ANSRV_GEO_IMAGE_WINDOWS_CORE_TAG: ghcr.io/ansys/geometry:core-windows-latest-unstable
2626
ANSRV_GEO_IMAGE_LINUX_CORE_TAG: ghcr.io/ansys/geometry:core-linux-latest-unstable
2727
ANSRV_GEO_PORT: 710
@@ -100,9 +100,7 @@ jobs:
100100
python-version: ${{ env.MAIN_PYTHON_VERSION }}
101101

102102
- name: Set up headless display
103-
uses: pyvista/setup-headless-display-action@52bda06d59c0fc422fc2512c9c670bf6b66616f8 # v3.2
104-
with:
105-
pyvista: false
103+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
106104

107105
- name: Create Python venv
108106
run: |
@@ -214,13 +212,15 @@ jobs:
214212
docker pull ${{ env.ANSRV_GEO_IMAGE_LINUX_CORE_TAG }}
215213
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 }}
216214
215+
- name: Set up headless display
216+
uses: pyvista/setup-headless-display-action@48066dd0b79cf46babc16223a1dce3aa4803ec43 # v4.0
217+
217218
- name: Run pytest
218-
uses: ansys/actions/tests-pytest@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
219+
uses: ansys/actions/tests-pytest@1f1f205361706d22f67c71c29b775222380cd95a # v9.0.6
219220
env:
220221
ALLOW_PLOTTING: true
221222
with:
222223
python-version: ${{ env.MAIN_PYTHON_VERSION }}
223-
requires-xvfb: true
224224

225225
- name: Stop the Geometry service
226226
if: always()

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
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.11.5
10+
rev: v0.11.6
1111
hooks:
1212
- id: ruff
1313
- id: ruff-format

‎doc/changelog.d/1914.added.md‎

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

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

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

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
update CHANGELOG for v0.10.6

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use v4 of pyvista/setup-headless-display-action

0 commit comments

Comments
 (0)