Skip to content

Commit b31f68d

Browse files
committed
Merge branch 'main' into release/0.8
2 parents a381325 + 82cb2fc commit b31f68d

File tree

7 files changed

+57
-22
lines changed

7 files changed

+57
-22
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
steps:
2929
- name: "Check library vulnerabilities - development mode"
3030
if: github.ref != 'refs/heads/main'
31-
uses: ansys/actions/check-vulnerabilities@v7
31+
uses: ansys/actions/check-vulnerabilities@v8
3232
with:
3333
token: ${{ secrets.SAFETY_TOKEN }}
3434
python-package-name: ${{ env.PACKAGE_NAME }}
3535
dev-mode: true
3636

3737
- name: "Check library vulnerabilities - default mode"
3838
if: github.ref == 'refs/heads/main'
39-
uses: ansys/actions/check-vulnerabilities@v7
39+
uses: ansys/actions/check-vulnerabilities@v8
4040
with:
4141
token: ${{ secrets.SAFETY_TOKEN }}
4242
python-package-name: ${{ env.PACKAGE_NAME }}
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- name: PyAnsys documentation style checks
49-
uses: ansys/actions/doc-style@v7
49+
uses: ansys/actions/doc-style@v8
5050
with:
5151
token: ${{ secrets.GITHUB_TOKEN }}
5252

@@ -61,7 +61,7 @@ jobs:
6161

6262
steps:
6363
- name: Build wheelhouse and perform smoke test
64-
uses: ansys/actions/build-wheelhouse@v7
64+
uses: ansys/actions/build-wheelhouse@v8
6565
with:
6666
library-name: ${{ env.PACKAGE_NAME }}
6767
operating-system: ${{ matrix.os }}
@@ -78,7 +78,7 @@ jobs:
7878

7979
steps:
8080
- name: Build wheelhouse and perform smoke test
81-
uses: ansys/actions/build-wheelhouse@v7
81+
uses: ansys/actions/build-wheelhouse@v8
8282
with:
8383
library-name: ${{ env.PACKAGE_NAME }}
8484
operating-system: ${{ runner.os }}
@@ -94,7 +94,7 @@ jobs:
9494
python-version: ['3.10', '3.11', '3.12']
9595
steps:
9696
- name: Run pytest
97-
uses: ansys/actions/tests-pytest@v7
97+
uses: ansys/actions/tests-pytest@v8
9898
with:
9999
python-version: ${{ matrix.python-version }}
100100
pytest-extra-args: "--cov=${{ env.PACKAGE_NAMESPACE }} --cov-report=term --cov-report=xml:.cov/coverage.xml --cov-report=html:.cov/html"
@@ -119,7 +119,7 @@ jobs:
119119
needs: [docs-style]
120120
steps:
121121
- name: "Run Ansys documentation building action"
122-
uses: ansys/actions/doc-build@v7
122+
uses: ansys/actions/doc-build@v8
123123
with:
124124
python-version: ${{ env.MAIN_PYTHON_VERSION }}
125125
dependencies: "build-essential zip pandoc texlive-latex-extra latexmk texlive-pstricks"
@@ -130,7 +130,7 @@ jobs:
130130
runs-on: ubuntu-latest
131131
steps:
132132
- name: Build library source and wheel artifacts
133-
uses: ansys/actions/build-library@v7
133+
uses: ansys/actions/build-library@v8
134134
with:
135135
library-name: ${{ env.PACKAGE_NAME }}
136136
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -148,13 +148,13 @@ jobs:
148148
contents: write
149149
steps:
150150
- name: Release to the public PyPI repository
151-
uses: ansys/actions/release-pypi-public@v7
151+
uses: ansys/actions/release-pypi-public@v8
152152
with:
153153
library-name: ${{ env.PACKAGE_NAME }}
154154
use-trusted-publisher: true
155155

156156
- name: Release to GitHub
157-
uses: ansys/actions/release-github@v7
157+
uses: ansys/actions/release-github@v8
158158
with:
159159
library-name: ${{ env.PACKAGE_NAME }}
160160

@@ -165,10 +165,12 @@ jobs:
165165
needs: [package]
166166
steps:
167167
- name: Deploy the latest documentation
168-
uses: ansys/actions/doc-deploy-dev@v7
168+
uses: ansys/actions/doc-deploy-dev@v8
169169
with:
170170
cname: ${{ env.DOCUMENTATION_CNAME }}
171-
token: ${{ secrets.GITHUB_TOKEN }}
171+
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
172+
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
173+
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
172174

173175
upload_docs_release:
174176
name: Upload release documentation
@@ -177,7 +179,9 @@ jobs:
177179
needs: [release]
178180
steps:
179181
- name: Deploy the stable documentation
180-
uses: ansys/actions/doc-deploy-stable@v7
182+
uses: ansys/actions/doc-deploy-stable@v8
181183
with:
182184
cname: ${{ env.DOCUMENTATION_CNAME }}
183-
token: ${{ secrets.GITHUB_TOKEN }}
185+
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
186+
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
187+
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 24.8.0 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
3+
rev: 24.10.0 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
44
hooks:
55
- id: black
66

77
- repo: https://github.com/adamchainz/blacken-docs
8-
rev: 1.18.0
8+
rev: 1.19.0
99
hooks:
1010
- id: blacken-docs
1111
additional_dependencies: [black==24.4.2]
@@ -34,14 +34,14 @@ repos:
3434
exclude: "tests/"
3535

3636
- repo: https://github.com/pre-commit/pre-commit-hooks
37-
rev: v4.6.0
37+
rev: v5.0.0
3838
hooks:
3939
- id: check-merge-conflict
4040
- id: debug-statements
4141

4242
# this validates our github workflow files
4343
- repo: https://github.com/python-jsonschema/check-jsonschema
44-
rev: 0.29.1
44+
rev: 0.29.4
4545
hooks:
4646
- id: check-github-workflows
4747

AUTHORS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This is the list of pyansys-tools-report's significant contributors.
2+
#
3+
# This file does not necessarily list everyone who has contributed code.
4+
#
5+
# For contributions made under a Corporate CLA, the organization is
6+
# added to this file.
7+
#
8+
# If you have contributed to the repository and want to be added to this file,
9+
# submit a request.
10+
#
11+
#
12+
ANSYS, Inc.

CONTRIBUTORS.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Contributors
2+
3+
## Project Lead
4+
5+
* [Roberto Pastor Muela](https://github.com/RobPasMue)
6+
7+
## Individual Contributors
8+
9+
* [Maxime Rey](https://github.com/MaxJPRey)
10+
* [Jorge Martínez Garrido](https://github.com/jorgepiloto)
11+
* [Germán Martínez Ayuso](https://github.com/germa89)
12+
* [Revathy Venugopal](https://github.com/Revathyvenugopal162)

doc/source/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,7 @@
120120
# Generate the LaTeX preamble
121121
latex_additional_files = [watermark, ansys_logo_white, ansys_logo_white_cropped]
122122
latex_elements = {"preamble": generate_preamble(html_title)}
123+
124+
linkcheck_ignore = [
125+
"https://opensource.org/licenses/MIT",
126+
]

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ dependencies = [
3232

3333
[project.optional-dependencies]
3434
tests = [
35-
"pytest==8.3.2",
35+
"pytest==8.3.3",
3636
"pytest-cov==5.0.0",
3737
]
3838
doc = [
39-
"ansys_sphinx_theme==1.0.3",
39+
"ansys_sphinx_theme==1.1.6",
4040
"numpydoc==1.8.0",
41-
"Sphinx==8.0.2",
41+
"Sphinx==8.1.3",
4242
"Sphinx-copybutton==0.5.2",
4343
"myst-parser==4.0.0",
4444
]

src/ansys/tools/report/report.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ def __init__(
147147
# bug that the user is trying to report.
148148
if gpu:
149149
try:
150-
from pyvista.utilities.errors import GPUInfo
150+
try:
151+
from pyvista.report import GPUInfo
152+
except ImportError:
153+
from pyvista.utilities.errors import GPUInfo # deprecated in PyVista 0.40
151154

152155
extra_meta = [(t[0], t[1]) for t in GPUInfo().get_info()]
153156
except:

0 commit comments

Comments
 (0)