Skip to content

Commit 1ce036d

Browse files
jonahrbjonahrb
authored
Merge branch 'main' into fix/export-facets
2 parents 63f280b + a4d521d commit 1ce036d

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

+754
-436
lines changed

‎.github/dependabot.yml‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
version: 2
2-
enable-beta-ecosystems: true # TODO: to be removed once the beta is stable for cooldown
32
updates:
43
- package-ecosystem: "pip"
54
directory: "/"
65
schedule:
76
interval: "daily"
87
cooldown:
9-
default-days: 5 # Fallback cooldown if no specific rule applies
10-
semver-major-days: 30 # Cooldown for major version updates
11-
semver-minor-days: 7 # Cooldown for minor version updates
12-
semver-patch-days: 3 # Cooldown for patch updates
8+
default-days: 5 # Fallback cooldown if no specific rule applies
9+
semver-major-days: 30 # Cooldown for major version updates
10+
semver-minor-days: 7 # Cooldown for minor version updates
11+
semver-patch-days: 3 # Cooldown for patch updates
1312
exclude:
1413
- "ansys-api-geometry"
14+
- "ansys-platform-instancemanagement"
15+
- "ansys-sphinx-theme"
16+
- "ansys-tools-path"
17+
- "ansys-tools-visualization-interface"
1518
labels:
1619
- "maintenance"
1720
- "dependencies"
@@ -20,23 +23,23 @@ updates:
2023
commit-message:
2124
prefix: "build"
2225
groups:
23-
grpc-deps:
24-
patterns:
25-
- "grpc*"
26-
- "protobuf"
27-
docs-deps:
28-
patterns:
29-
- "ansys-sphinx-theme*"
30-
- "ipyvtklink"
31-
- "jupyter_sphinx"
32-
- "jupytext"
33-
- "myst-parser"
34-
- "nbconvert"
35-
- "nbsphinx"
36-
- "notebook"
37-
- "numpydoc"
38-
- "sphinx"
39-
- "sphinx*"
26+
grpc-deps:
27+
patterns:
28+
- "grpc*"
29+
- "protobuf"
30+
docs-deps:
31+
patterns:
32+
- "ansys-sphinx-theme*"
33+
- "ipyvtklink"
34+
- "jupyter_sphinx"
35+
- "jupytext"
36+
- "myst-parser"
37+
- "nbconvert"
38+
- "nbsphinx"
39+
- "notebook"
40+
- "numpydoc"
41+
- "sphinx"
42+
- "sphinx*"
4043

4144
- package-ecosystem: "github-actions"
4245
directory: "/"
@@ -57,6 +60,6 @@ updates:
5760
commit-message:
5861
prefix: "ci"
5962
groups:
60-
actions:
61-
patterns:
62-
- "*"
63+
actions:
64+
patterns:
65+
- "*"

‎.github/labeler.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
documentation:
2-
- changed-files:
3-
- any-glob-to-any-file: 'doc/source/**/*'
4-
- any-glob-to-any-file: 'README.rst'
2+
- changed-files:
3+
- any-glob-to-any-file: 'doc/source/**/*'
4+
- any-glob-to-any-file: 'README.rst'
55
maintenance:
6-
- changed-files:
7-
- any-glob-to-any-file: '.github/**/*'
8-
- any-glob-to-any-file: 'pyproject.toml'
6+
- changed-files:
7+
- any-glob-to-any-file: '.github/**/*'
8+
- any-glob-to-any-file: 'pyproject.toml'
99
testing:
10-
- changed-files:
11-
- any-glob-to-any-file: 'tests/*'
10+
- changed-files:
11+
- any-glob-to-any-file: 'tests/*'

‎.github/workflows/backwards_compatibility.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
if: runner.name == 'pygeometry-ci-2'
8888
env:
8989
LICENSE_SERVER_INTERNAL: ${{ secrets.LICENSE_SERVER_INTERNAL }}
90-
run:
90+
run: |
9191
echo "ANSRV_GEO_LICENSE_SERVER=$env:LICENSE_SERVER_INTERNAL" | Out-File -FilePath $env:GITHUB_ENV -Append
9292
9393
- name: Stop any running containers
@@ -121,7 +121,7 @@ jobs:
121121
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
122122
123123
- name: Testing
124-
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
124+
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
125125
env:
126126
BACKEND_VERSION: ${{ matrix.backend-version }}
127127
run: |
@@ -151,10 +151,9 @@ jobs:
151151
docker rm $dockerContainers
152152
}
153153
154-
# =================================================================================================
155-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
156-
# =================================================================================================
157-
154+
# =================================================================================================
155+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
156+
# =================================================================================================
158157

159158
testing-backwards-compatibility-windows:
160159
name: Windows ${{ matrix.backend-version }}
@@ -214,7 +213,7 @@ jobs:
214213
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
215214
216215
- name: Testing
217-
timeout-minutes: 20 # Sometimes hangs...
216+
timeout-minutes: 20 # Sometimes hangs...
218217
env:
219218
BACKEND_VERSION: ${{ matrix.backend-version }}
220219
run: |

‎.github/workflows/ci_cd.yml‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: PyAnsys documentation style checks
8383
uses: ansys/actions/doc-style@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
8484
with:
85-
token: ${{ secrets.GITHUB_TOKEN }}
85+
token: ${{ secrets.GITHUB_TOKEN }}
8686

8787
smoke-tests:
8888
name: Build and Smoke tests
@@ -157,7 +157,6 @@ jobs:
157157
touch ${CONTAINER_UNSTABLE}.json
158158
fi
159159
160-
161160
# Check if the manifests are the same (and if so, create an output that will skip the next job)
162161
if diff ${CONTAINER_STABLE}.json ${CONTAINER_UNSTABLE}.json; then
163162
echo "${SERVICE_NAME} container manifests are the same... skipping"
@@ -269,11 +268,11 @@ jobs:
269268
path: .\tests\integration\image_cache
270269
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
271270
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
272-
lookup-only: false # zizmor: ignore[cache-poisoning]
271+
lookup-only: false # zizmor: ignore[cache-poisoning]
273272

274273
- name: Testing
275274
if: env.SKIP_UNSTABLE == 'false'
276-
timeout-minutes: 20 # Sometimes hangs...
275+
timeout-minutes: 20 # Sometimes hangs...
277276
run: |
278277
pytest -v
279278
@@ -380,7 +379,7 @@ jobs:
380379
env:
381380
DOCKER_IMAGE: ${{ matrix.docker-image }}
382381
SKIP_CORE_LINUX: ${{ needs.manifests.outputs.skip_core_linux }}
383-
VARS_SKIP_UNSTABLE_CONTAINERS_TEMPORARILY: ${{ vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY }}
382+
VARS_SKIP_UNSTABLE_CONTAINERS_TEMPORARILY: ${{ vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY}}
384383
run: |
385384
# Choose the manifests output to consider (for Core service)
386385
# based on the matrix value
@@ -436,7 +435,7 @@ jobs:
436435
path: tests/integration/image_cache
437436
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
438437
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
439-
lookup-only: false # zizmor: ignore[cache-poisoning]
438+
lookup-only: false # zizmor: ignore[cache-poisoning]
440439

441440
- name: Run pytest
442441
if: env.SKIP_UNSTABLE == 'false'
@@ -610,9 +609,9 @@ jobs:
610609
python-version: ${{ env.MAIN_PYTHON_VERSION }}
611610
attest-provenance: true
612611

613-
# =================================================================================================
614-
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv RUNNING ON SELF-HOSTED RUNNER vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
615-
# =================================================================================================
612+
# =================================================================================================
613+
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv RUNNING ON SELF-HOSTED RUNNER vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
614+
# =================================================================================================
616615

617616
fetch-release-artifacts:
618617
name: Fetch release artifacts
@@ -734,7 +733,7 @@ jobs:
734733
if: runner.name == 'pygeometry-ci-2'
735734
env:
736735
LICENSE_SERVER_INTERNAL: ${{ secrets.LICENSE_SERVER_INTERNAL }}
737-
run:
736+
run: |
738737
echo "ANSRV_GEO_LICENSE_SERVER=$env:LICENSE_SERVER_INTERNAL" | Out-File -FilePath $env:GITHUB_ENV -Append
739738
740739
- name: Validate connection using PyAnsys Geometry
@@ -750,7 +749,7 @@ jobs:
750749
path: .\tests\integration\image_cache
751750
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
752751
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
753-
lookup-only: false # zizmor: ignore[cache-poisoning]
752+
lookup-only: false # zizmor: ignore[cache-poisoning]
754753

755754
- name: Start Geometry service and verify start
756755
env:
@@ -767,7 +766,7 @@ jobs:
767766
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
768767
769768
- name: Testing
770-
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
769+
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
771770
run: |
772771
.\.venv\Scripts\Activate.ps1
773772
pytest -v --use-existing-service=yes
@@ -807,9 +806,9 @@ jobs:
807806
docker image rm ghcr.io/ansys/geometry:windows-tmp
808807
docker system prune -f
809808
810-
# =================================================================================================
811-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
812-
# =================================================================================================
809+
# =================================================================================================
810+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
811+
# =================================================================================================
813812

814813
build-linux-container:
815814
name: Building Geometry Service - Linux
@@ -858,7 +857,7 @@ jobs:
858857
path: .\tests\integration\image_cache
859858
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
860859
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
861-
lookup-only: false # zizmor: ignore[cache-poisoning]
860+
lookup-only: false # zizmor: ignore[cache-poisoning]
862861

863862
- name: Run pytest
864863
uses: ansys/actions/tests-pytest@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
@@ -938,8 +937,10 @@ jobs:
938937
upload_dev_docs:
939938
name: Upload dev documentation
940939
if: github.ref == 'refs/heads/main'
941-
runs-on: ubuntu-latest
942940
needs: [package]
941+
runs-on: ubuntu-latest
942+
permissions:
943+
contents: write
943944
steps:
944945
- name: Deploy the latest documentation
945946
uses: ansys/actions/doc-deploy-dev@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
@@ -952,8 +953,10 @@ jobs:
952953
upload_docs_release:
953954
name: Upload release documentation
954955
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
955-
runs-on: ubuntu-latest
956956
needs: [release, release-pypi]
957+
runs-on: ubuntu-latest
958+
permissions:
959+
contents: write
957960
steps:
958961
- name: Deploy the stable documentation
959962
uses: ansys/actions/doc-deploy-stable@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4

‎.github/workflows/codeql.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches: ["main"]
66
pull_request:
7-
branches: [ "main" ]
7+
branches: ["main"]
88
schedule:
99
- cron: '45 22 * * 4'
1010

@@ -20,28 +20,28 @@ jobs:
2020
contents: read
2121
security-events: write
2222
steps:
23-
- name: Checkout repository
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25-
with:
26-
persist-credentials: false
27-
28-
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
30-
with:
31-
languages: 'python'
32-
config-file: ./.github/codeql-config.yml
33-
34-
- name: Autobuild
35-
uses: github/codeql-action/autobuild@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
36-
37-
# If the Autobuild fails above, remove it and uncomment the following three lines.
38-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
39-
40-
# - run: |
41-
# echo "Run, Build Application using script"
42-
# ./location_of_script_within_repo/buildscript.sh
43-
44-
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
46-
with:
47-
category: "/language:python"
23+
- name: Checkout repository
24+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
with:
26+
persist-credentials: false
27+
28+
- name: Initialize CodeQL
29+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
30+
with:
31+
languages: 'python'
32+
config-file: ./.github/codeql-config.yml
33+
34+
- name: Autobuild
35+
uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
36+
37+
# If the Autobuild fails above, remove it and uncomment the following three lines.
38+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
39+
40+
# - run: |
41+
# echo "Run, Build Application using script"
42+
# ./location_of_script_within_repo/buildscript.sh
43+
44+
- name: Perform CodeQL Analysis
45+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
46+
with:
47+
category: "/language:python"

‎.github/workflows/docker_cleanup.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ jobs:
2121
packages: write
2222
steps:
2323

24-
- name: "Perform versions cleanup - except certain tags"
25-
uses: ansys/actions/hk-package-clean-except@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
26-
with:
27-
package-name: 'geometry'
28-
token: ${{ secrets.GITHUB_TOKEN }}
29-
tags-kept: 'windows-latest, windows-latest-unstable, core-windows-latest, core-windows-latest-unstable, core-linux-latest, core-linux-latest-unstable, 24.1, 24.2, 25.1, windows-24.1, windows-24.2, windows-25.1, windows-25.2, core-windows-25.2, core-linux-25.2, simba-plugin-geometry'
24+
- name: "Perform versions cleanup - except certain tags"
25+
uses: ansys/actions/hk-package-clean-except@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
26+
with:
27+
package-name: 'geometry'
28+
token: ${{ secrets.GITHUB_TOKEN }}
29+
tags-kept: 'windows-latest, windows-latest-unstable, core-windows-latest, core-windows-latest-unstable, core-linux-latest,
30+
core-linux-latest-unstable, 24.1, 24.2, 25.1, windows-24.1, windows-24.2, windows-25.1, windows-25.2, core-windows-25.2,
31+
core-linux-25.2, simba-plugin-geometry'

0 commit comments

Comments
 (0)