Skip to content

Commit c8bda62

Browse files
committed
Merge branch 'main' into release/0.7
2 parents 2976dba + 8854616 commit c8bda62

Some content is hidden

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

69 files changed

+1094
-252
lines changed

.github/workflows/ci_cd.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,13 @@ jobs:
4545
name: Vulnerabilities
4646
runs-on: ubuntu-latest
4747
steps:
48-
- name: PyAnsys Vulnerability check (on main)
49-
if: github.ref == 'refs/heads/main'
50-
uses: ansys/actions/check-vulnerabilities@v8
48+
- uses: ansys/actions/check-vulnerabilities@v8
5149
with:
5250
python-version: ${{ env.MAIN_PYTHON_VERSION }}
5351
python-package-name: ${{ env.PACKAGE_NAME }}
5452
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
53+
dev-mode: ${{ github.ref != 'refs/heads/main' }}
5554

56-
- name: PyAnsys Vulnerability check (on dev mode)
57-
if: github.ref != 'refs/heads/main'
58-
uses: ansys/actions/check-vulnerabilities@v8
59-
with:
60-
python-version: ${{ env.MAIN_PYTHON_VERSION }}
61-
python-package-name: ${{ env.PACKAGE_NAME }}
62-
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
63-
dev-mode: true
6455
pr-name:
6556
if: github.event_name == 'pull_request'
6657
name: Check the name of the PR

.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, 25.1, windows-24.1, windows-24.2, windows-25.1, linux-24.1, linux-24.2, linux-25.1'
29+
tags-kept: 'windows-latest, windows-latest-unstable, windows-coreservice, windows-coreservice-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'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,7 @@ docker/*-binaries.zip
164164
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
165165
#.idea/
166166

167+
# Ignore scripts folder
168+
scripts
169+
167170
# End of https://www.toptal.com/developers/gitignore/api/python

.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.6.9
10+
rev: v0.7.1
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.29.3
38+
rev: 0.29.4
3939
hooks:
4040
- id: check-github-workflows
4141

CONTRIBUTORS.md

Lines changed: 9 additions & 0 deletions

doc/changelog.d/1454.added.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1476.maintenance.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1478.fixed.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1479.dependencies.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/1480.maintenance.md

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)