Skip to content

Commit c595cb3

Browse files
authored
Merge branch 'main' into feat/py313
2 parents f0eb4b7 + f6ed297 commit c595cb3

Some content is hidden

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

56 files changed

+1139
-266
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.3
1111
hooks:
1212
- id: ruff
1313
- id: ruff-format
@@ -27,7 +27,7 @@ repos:
2727
- id: trailing-whitespace
2828

2929
- repo: https://github.com/ansys/pre-commit-hooks
30-
rev: v0.4.3
30+
rev: v0.4.4
3131
hooks:
3232
- id: add-license-headers
3333
args:

CONTRIBUTORS.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,24 @@
88

99
* [Alejandro Fernández](https://github.com/AlejandroFernandezLuces)
1010
* [Alexander Kaszynski](https://github.com/akaszynski)
11+
* [Bane Sullivan](https://github.com/banesullivan)
12+
* [Camille Latapie](https://github.com/clatapie)
1113
* [Chad Queen](https://github.com/chadqueen)
1214
* [Chris Hawkins](https://github.com/chris-hawkins-usa)
1315
* [Dastan Abdulla](https://github.com/dastan-ansys)
16+
* [Dominik Gresch](https://github.com/greschd)
17+
* [Germán Martínez](https://github.com/germa89)
18+
* [Jason Welling](https://github.com/JasonWelling)
1419
* [Jonah Boling](https://github.com/jonahrb)
1520
* [Jorge Martínez](https://github.com/jorgepiloto)
21+
* [Kathy Pippert](https://github.com/PipKat)
22+
* [Kerry McAdams](https://github.com/klmcadams)
1623
* [Lance Lance](https://github.com/LanceX2214)
1724
* [Matteo Bini](https://github.com/b-matteo)
1825
* [Maxime Rey](https://github.com/MaxJPRey)
26+
* [Rajesh Meena](https://github.com/rajesh1359)
1927
* [Revathy Venugopal](https://github.com/Revathyvenugopal162)
2028
* [Riccardo Manno](https://github.com/rmanno91)
2129
* [Sebastien Morais](https://github.com/SMoraisAnsys)
30+
* [Stefano Mereu](https://github.com/smereu)
2231
* [Umut Soysal](https://github.com/umutsoysal)

doc/changelog.d/1476.maintenance.md

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

doc/changelog.d/1478.fixed.md

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

doc/changelog.d/1479.dependencies.md

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

doc/changelog.d/1482.dependencies.md

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

doc/changelog.d/1485.documentation.md

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

0 commit comments

Comments
 (0)