Skip to content

Commit e434f14

Browse files
RobPasMueRobPasMue
committed
Merge branch 'main' into release/0.10
2 parents d267d3a + ae82b0c commit e434f14

35 files changed

+409
-127
lines changed

‎.github/workflows/ci_cd.yml‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
contents: write
3636
pull-requests: write
3737
steps:
38-
- uses: ansys/actions/doc-deploy-changelog@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
38+
- uses: ansys/actions/doc-deploy-changelog@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
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@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
48+
- uses: ansys/actions/check-vulnerabilities@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
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@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
61+
uses: ansys/actions/check-pr-title@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
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@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
70+
uses: ansys/actions/doc-style@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
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@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
89+
uses: ansys/actions/build-wheelhouse@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
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@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
101+
uses: ansys/actions/docker-style@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
102102
with:
103103
directory: docker
104104
recursive: true
@@ -293,7 +293,7 @@ jobs:
293293
retention-days: 7
294294

295295
- name: Upload coverage to Codecov
296-
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
296+
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
297297
if: matrix.docker-image == 'core-windows-latest'
298298
env:
299299
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -342,7 +342,7 @@ jobs:
342342
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 }}
343343
344344
- name: Run Ansys documentation building action
345-
uses: ansys/actions/doc-build@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
345+
uses: ansys/actions/doc-build@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
346346
with:
347347
python-version: ${{ env.MAIN_PYTHON_VERSION }}
348348
add-pdf-html-docs-as-assets: true
@@ -429,7 +429,7 @@ jobs:
429429

430430
- name: Run pytest
431431
if: env.SKIP_UNSTABLE == 'false'
432-
uses: ansys/actions/tests-pytest@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
432+
uses: ansys/actions/tests-pytest@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
433433
env:
434434
ALLOW_PLOTTING: true
435435
with:
@@ -481,11 +481,6 @@ jobs:
481481
username: ${{ github.actor }}
482482
password: ${{ secrets.GITHUB_TOKEN }}
483483

484-
- name: Pull and launch geometry service
485-
run: |
486-
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
487-
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 }}
488-
489484
- name: Checkout repository
490485
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
491486

@@ -500,6 +495,12 @@ jobs:
500495
pip install -e .[all,tests-minimal]
501496
pip install pytest
502497
498+
- name: Start Geometry service and verify start
499+
run: |
500+
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
501+
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 }}
502+
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
503+
503504
- name: Run pytest
504505
run: |
505506
pytest -v
@@ -529,11 +530,6 @@ jobs:
529530
username: ${{ github.actor }}
530531
password: ${{ secrets.GITHUB_TOKEN }}
531532

532-
- name: Pull and launch geometry service
533-
run: |
534-
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
535-
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 }}
536-
537533
- name: Checkout repository
538534
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
539535

@@ -551,6 +547,12 @@ jobs:
551547
# Installing docker (needed for the tests)
552548
pip install docker
553549
550+
- name: Start Geometry service and verify start
551+
run: |
552+
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
553+
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 }}
554+
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
555+
554556
- name: Run pytest
555557
run: |
556558
pytest -v -c pytest-nographics.ini
@@ -562,7 +564,6 @@ jobs:
562564
docker logs ${{ env.GEO_CONT_NAME }}
563565
docker rm ${{ env.GEO_CONT_NAME }}
564566
565-
566567
package:
567568
name: Package library
568569
needs: [testing-windows, testing-linux, testing-min-reqs, testing-no-graphics, docs]
@@ -573,7 +574,7 @@ jobs:
573574
id-token: write
574575
steps:
575576
- name: Build library source and wheel artifacts
576-
uses: ansys/actions/build-library@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
577+
uses: ansys/actions/build-library@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
577578
with:
578579
library-name: ${{ env.PACKAGE_NAME }}
579580
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -691,17 +692,12 @@ jobs:
691692
run:
692693
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
693694

694-
- name: Launch Geometry service
695-
run: |
696-
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
697-
698695
- name: Validate connection using PyAnsys Geometry
699696
run: |
700697
python -m venv .venv
701698
.\.venv\Scripts\Activate.ps1
702699
python -m pip install --upgrade pip
703700
pip install -e .[tests]
704-
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
705701
706702
- name: Restore images cache
707703
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
@@ -710,6 +706,12 @@ jobs:
710706
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
711707
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
712708

709+
- name: Start Geometry service and verify start
710+
run: |
711+
.\.venv\Scripts\Activate.ps1
712+
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
713+
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
714+
713715
- name: Testing
714716
run: |
715717
.\.venv\Scripts\Activate.ps1
@@ -778,14 +780,14 @@ jobs:
778780
run: |
779781
docker build -f linux/coreservice/Dockerfile -t ghcr.io/ansys/geometry:linux-tmp .
780782
781-
- name: Launch Geometry service
782-
run: |
783-
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
784-
785783
- name: Validate connection using PyAnsys Geometry
786784
run: |
787785
python -m pip install --upgrade pip
788786
pip install -e .[tests]
787+
788+
- name: Start Geometry service and verify start
789+
run: |
790+
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
789791
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
790792
791793
- name: Restore images cache
@@ -796,7 +798,7 @@ jobs:
796798
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
797799

798800
- name: Run pytest
799-
uses: ansys/actions/tests-pytest@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
801+
uses: ansys/actions/tests-pytest@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
800802
env:
801803
ALLOW_PLOTTING: true
802804
with:
@@ -838,7 +840,7 @@ jobs:
838840
contents: write
839841
steps:
840842
- name: Release to GitHub
841-
uses: ansys/actions/release-github@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
843+
uses: ansys/actions/release-github@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
842844
with:
843845
token: ${{ secrets.GITHUB_TOKEN }}
844846
library-name: ${{ env.PACKAGE_NAME }}
@@ -878,7 +880,7 @@ jobs:
878880
needs: [package]
879881
steps:
880882
- name: Deploy the latest documentation
881-
uses: ansys/actions/doc-deploy-dev@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
883+
uses: ansys/actions/doc-deploy-dev@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
882884
with:
883885
cname: ${{ env.DOCUMENTATION_CNAME }}
884886
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -889,10 +891,10 @@ jobs:
889891
name: Upload release documentation
890892
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
891893
runs-on: ubuntu-latest
892-
needs: [release]
894+
needs: [release, release-pypi]
893895
steps:
894896
- name: Deploy the stable documentation
895-
uses: ansys/actions/doc-deploy-stable@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
897+
uses: ansys/actions/doc-deploy-stable@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
896898
with:
897899
cname: ${{ env.DOCUMENTATION_CNAME }}
898900
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
@@ -909,7 +911,7 @@ jobs:
909911
pull-requests: write
910912
steps:
911913
- name: Automerge PRs
912-
uses: ansys/actions/hk-automerge-prs@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
914+
uses: ansys/actions/hk-automerge-prs@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
913915
with:
914916
approver: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
915917
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@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
25+
uses: ansys/actions/hk-package-clean-except@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
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@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
103+
- uses: ansys/actions/doc-changelog@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
104104
with:
105105
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
106106
use-conventional-commits: true

‎.github/workflows/nightly_docker_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
run: docker image prune -f
165165

166166
- name: Microsoft Teams Notification
167-
uses: skitionek/notify-microsoft-teams@190d4d92146df11f854709774a4dae6eaf5e2aa3 # master
167+
uses: skitionek/notify-microsoft-teams@755c127ef3757945e5e97508914103d76ef7a925 # v1.0.9
168168
if: failure()
169169
with:
170170
webhook_url: ${{ secrets.MSTEAMS_WEBHOOK }}
@@ -215,7 +215,7 @@ jobs:
215215
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 }}
216216
217217
- name: Run pytest
218-
uses: ansys/actions/tests-pytest@c4fcd69508c0981431c7e85eed02b5008729d01a # v9.0.1
218+
uses: ansys/actions/tests-pytest@4f15ff3ab1183912ce862d51b8c66ea124b052a1 # v9.0.2
219219
env:
220220
ALLOW_PLOTTING: true
221221
with:
@@ -230,7 +230,7 @@ jobs:
230230
docker rm ${{ env.GEO_CONT_NAME }}
231231
232232
- name: Microsoft Teams Notification
233-
uses: skitionek/notify-microsoft-teams@190d4d92146df11f854709774a4dae6eaf5e2aa3 # master
233+
uses: skitionek/notify-microsoft-teams@755c127ef3757945e5e97508914103d76ef7a925 # v1.0.9
234234
if: failure()
235235
with:
236236
webhook_url: ${{ secrets.MSTEAMS_WEBHOOK }}

‎.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.11.4
10+
rev: v0.11.5
1111
hooks:
1212
- id: ruff
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.32.1
38+
rev: 0.33.0
3939
hooks:
4040
- id: check-github-workflows
4141

‎CONTRIBUTORS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
## Individual Contributors
88

9+
* [Alan George Varghese](https://github.com/agvarghe)
910
* [Alex Fernandez](https://github.com/AlejandroFernandezLuces)
1011
* [Alex Kaszynski](https://github.com/akaszynski)
1112
* [Bane Sullivan](https://github.com/banesullivan)

‎doc/changelog.d/1901.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.4

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
make doc releases dependent on GH and PyPI release

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bump ansys/actions from 9.0.1 to 9.0.2 in the actions group

‎doc/changelog.d/1906.dependencies.md‎

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.56 to 0.4.57

0 commit comments

Comments
 (0)