Skip to content

Commit f38d411

Browse files
committed
Merge branch 'main' into release/0.6
2 parents 2980b76 + 8321970 commit f38d411

File tree

102 files changed

+1109
-248
lines changed

Some content is hidden

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

102 files changed

+1109
-248
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@ updates:
1414
groups:
1515
grpc-deps:
1616
patterns:
17-
- "google*"
1817
- "grpc*"
1918
- "protobuf"
2019
docs-deps:
2120
patterns:
22-
- "*sphinx*"
23-
- "*jupy*"
21+
- "ansys-sphinx-theme*"
2422
- "ipyvtklink"
23+
- "jupyter_sphinx"
24+
- "jupytext"
2525
- "myst-parser"
2626
- "nbconvert"
27+
- "nbsphinx"
2728
- "notebook"
2829
- "numpydoc"
29-
- "panel"
30+
- "sphinx"
31+
- "sphinx*"
3032

3133
- package-ecosystem: "github-actions"
3234
directory: "/"

.github/workflows/ci_cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
ANSRV_GEO_PORT: 700
1818
ANSRV_GEO_LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
1919
GEO_CONT_NAME: ans_geo
20-
RESET_IMAGE_CACHE: 1
20+
RESET_IMAGE_CACHE: 2
2121
IS_WORKFLOW_RUNNING: True
2222
ARTIFACTORY_VERSION: v251
2323
MEILISEARCH_API_KEY: ${{ secrets.MEILISEARCH_API_KEY }}

.github/workflows/docker_cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
with:
2727
package-name: 'geometry'
2828
token: ${{ secrets.GITHUB_TOKEN }}
29-
tags-kept: 'windows-latest, windows-latest-unstable, linux-latest, linux-latest-unstable, 24.1, 24.2, windows-24.1, windows-24.2, linux-24.1, linux-24.2'
29+
tags-kept: 'windows-latest, windows-latest-unstable, linux-latest, linux-latest-unstable, 24.1, 24.2, 25.1, windows-24.1, windows-24.2, windows-25.1, linux-24.1, linux-24.2, linux-25.1'

.pre-commit-config.yaml

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

99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: v0.5.0
10+
rev: v0.5.5
1111
hooks:
1212
- id: ruff
13+
- id: ruff-format
1314

1415
- repo: https://github.com/codespell-project/codespell
1516
rev: v2.3.0
@@ -29,13 +30,12 @@ repos:
2930
rev: v0.3.1
3031
hooks:
3132
- id: add-license-headers
32-
files: '(src|examples|tests|docker)/.*\.(py)|\.(proto)'
3333
args:
3434
- --start_year=2023
3535

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

doc/changelog.d/1290.changed.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1291.fixed.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1292.dependencies.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1293.added.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1294.fixed.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1296.dependencies.md

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)