Skip to content

Commit 6b4fa0b

Browse files
committed
Merge branch 'main' into release/0.4
2 parents 1e99b37 + 8271228 commit 6b4fa0b

Some content is hidden

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

66 files changed

+2033
-435
lines changed

.github/workflows/ci_cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: PyAnsys documentation style checks
3939
uses: ansys/actions/doc-style@v4
4040
with:
41-
token: ${{ secrets.GITHUB_TOKEN }}
41+
token: ${{ secrets.GITHUB_TOKEN }}
4242

4343
smoke-tests:
4444
name: Build and Smoke tests
@@ -47,7 +47,7 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
os: [ubuntu-latest, windows-latest, macos-latest]
50-
python-version: ['3.9', '3.10', '3.11']
50+
python-version: ['3.9', '3.10', '3.11', '3.12']
5151
should-release:
5252
- ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags') }}
5353
exclude:

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

.pre-commit-config.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ exclude: "tests/integration/files"
22
repos:
33

44
- repo: https://github.com/psf/black
5-
rev: 23.9.1 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
5+
rev: 23.11.0 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
66
hooks:
77
- id: black
88

99
- repo: https://github.com/adamchainz/blacken-docs
1010
rev: 1.16.0
1111
hooks:
1212
- id: blacken-docs
13-
additional_dependencies: [black==23.9.1]
13+
additional_dependencies: [black==23.11.0]
1414

1515
- repo: https://github.com/pycqa/isort
1616
rev: 5.12.0
@@ -32,7 +32,7 @@ repos:
3232
rev: v2.2.6
3333
hooks:
3434
- id: codespell
35-
args: ["--ignore-words", "doc/styles/Vocab/ANSYS/accept.txt"]
35+
args: ["--ignore-words", "doc/styles/Vocab/ANSYS/accept.txt", "-w"]
3636

3737
- repo: https://github.com/pycqa/pydocstyle
3838
rev: 6.3.0
@@ -42,21 +42,20 @@ repos:
4242
exclude: "tests/"
4343

4444
- repo: https://github.com/pre-commit/pre-commit-hooks
45-
rev: v4.4.0
45+
rev: v4.5.0
4646
hooks:
4747
- id: check-merge-conflict
4848
- id: debug-statements
4949
- id: check-yaml
5050
- id: trailing-whitespace
5151

52-
- repo: https://github.com/ansys/pre-commit-hooks
53-
rev: v0.1.3
54-
hooks:
55-
- id: add-license-headers
56-
args: ["--loc", "./"]
52+
# - repo: https://github.com/ansys/pre-commit-hooks
53+
# rev: v0.2.2
54+
# hooks:
55+
# - id: add-license-headers
5756

5857
# this validates our github workflow files
5958
- repo: https://github.com/python-jsonschema/check-jsonschema
60-
rev: 0.27.0
59+
rev: 0.27.1
6160
hooks:
6261
- id: check-github-workflows

.reuse/dep5

Lines changed: 0 additions & 84 deletions
This file was deleted.

.reuse/templates/ansys.jinja2

Lines changed: 0 additions & 27 deletions
This file was deleted.

CONTRIBUTORS.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66

77
## Individual Contributors
88

9-
* [Jonah Boling](https://github.com/jonahrb)
10-
* [Matteo Bini](https://github.com/b-matteo)
11-
* [Chris Hawkins](https://github.com/chris-hawkins-usa)
12-
* [Chad Queen](https://github.com/chadqueen)
13-
* [Revathy Venugopal](https://github.com/Revathyvenugopal162)
14-
* [Maxime Rey](https://github.com/MaxJPRey)
9+
* [Alejandro Fernández](https://github.com/AlejandroFernandezLuces)
1510
* [Alexander Kaszynski](https://github.com/akaszynski)
11+
* [Chad Queen](https://github.com/chadqueen)
12+
* [Chris Hawkins](https://github.com/chris-hawkins-usa)
13+
* [Dastan Abdulla](https://github.com/dastan-ansys)
14+
* [Jonah Boling](https://github.com/jonahrb)
1615
* [Jorge Martínez](https://github.com/jorgepiloto)
17-
* [Alejandro Fernández](https://github.com/AlejandroFernandezLuces)
1816
* [Lance Lance](https://github.com/LanceX2214)
19-
* [Dastan Abdulla](https://github.com/dastan-ansys)
17+
* [Matteo Bini](https://github.com/b-matteo)
18+
* [Maxime Rey](https://github.com/MaxJPRey)
19+
* [Revathy Venugopal](https://github.com/Revathyvenugopal162)
2020
* [Riccardo Manno](https://github.com/rmanno91)
21+
* [Umut Soysal](https://github.com/umutsoysal)

0 commit comments

Comments
 (0)