Skip to content

Commit 41b761a

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents f126583 + 81512c5 commit 41b761a

File tree

177 files changed

+3152
-673
lines changed

Some content is hidden

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

177 files changed

+3152
-673
lines changed

.github/workflows/docs.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ env:
3636
PYDEVD_DISABLE_FILE_VALIDATION: "1"
3737
PYTEST_ADDOPTS: "--color=yes"
3838
FORCE_COLOR: "True"
39+
VTK_DEFAULT_OPENGL_WINDOW: "vtkOSOpenGLRenderWindow"
3940

4041
permissions:
4142
id-token: none
@@ -58,7 +59,7 @@ jobs:
5859
python-version: "3.12"
5960
cache: "pip"
6061

61-
- uses: awalsh128/cache-apt-pkgs-action@v1.4.3
62+
- uses: awalsh128/cache-apt-pkgs-action@v1.5.0
6263
with:
6364
packages: libosmesa6-dev libgl1-mesa-dev python3-tk pandoc git-restore-mtime
6465
version: 3.0
@@ -67,11 +68,6 @@ jobs:
6768
run: |
6869
pip install -e .[docs]
6970
70-
- name: Install custom OSMesa VTK variant
71-
run: |
72-
pip uninstall vtk -y
73-
pip install vtk-osmesa==9.3.0 --index-url https://gitlab.kitware.com/api/v4/projects/13/packages/pypi/simple
74-
7571
- name: PyVista Report
7672
run: |
7773
python -c "import pyvista;print(pyvista.Report())"

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
CARTOPY_SHARE_DIR: ~/.local/share/cartopy
105105
GEOVISTA_POOCH_MUTE: true
106106
steps:
107-
- uses: awalsh128/cache-apt-pkgs-action@v1.4.3
107+
- uses: awalsh128/cache-apt-pkgs-action@v1.5.0
108108
if: env.USE_CACHE == 'true'
109109
with:
110110
packages: xvfb

.github/workflows/linkcheck.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
python-version: "3.12"
3030
cache: "pip"
3131

32-
- uses: awalsh128/cache-apt-pkgs-action@v1.4.3
32+
- uses: awalsh128/cache-apt-pkgs-action@v1.5.0
3333
with:
3434
packages: libosmesa6-dev libgl1-mesa-dev python3-tk pandoc git-restore-mtime
3535
version: 3.0
@@ -38,10 +38,5 @@ jobs:
3838
run: |
3939
pip install -e .[docs]
4040
41-
- name: Install custom OSMesa VTK variant
42-
run: |
43-
pip uninstall vtk -y
44-
pip install vtk-osmesa==9.3.0 --index-url https://gitlab.kitware.com/api/v4/projects/13/packages/pypi/simple
45-
4641
- name: LinkCheck
4742
run: make -C doc linkcheck SPHINXOPTS="--color"

.github/workflows/style_docstr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
pip install -e .[test]
4040
4141
- name: Setup headless display
42-
uses: pyvista/setup-headless-display-action@v2
42+
uses: pyvista/setup-headless-display-action@v3
4343

4444
- name: Software Report
4545
run: |

.github/workflows/testing-and-deployment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
- name: Core Testing (no GL)
162162
run: python -m pytest --cov=pyvista --cov-branch -v --ignore=tests/plotting
163163

164-
- uses: awalsh128/cache-apt-pkgs-action@v1.4.3
164+
- uses: awalsh128/cache-apt-pkgs-action@v1.5.0
165165
if: always()
166166
with:
167167
packages: xvfb
@@ -230,7 +230,7 @@ jobs:
230230
cache: "pip"
231231

232232
- name: Set up headless display
233-
uses: pyvista/setup-headless-display-action@v2
233+
uses: pyvista/setup-headless-display-action@v3
234234

235235
- name: Install PyVista test dependencies
236236
run: pip install .[test]

.github/workflows/vtk-pre-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Install PyVista Testing Requirements
5353
run: pip install .[test]
5454

55-
- uses: awalsh128/cache-apt-pkgs-action@v1.4.3
55+
- uses: awalsh128/cache-apt-pkgs-action@v1.5.0
5656
with:
5757
packages: xvfb
5858
version: 3.0

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,6 @@ venv/
103103

104104
# VSCode
105105
.vscode/
106+
107+
# Ignore tags file
108+
tags

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ repos:
6464

6565
# this validates our github workflow files
6666
- repo: https://github.com/python-jsonschema/check-jsonschema
67-
rev: 0.31.2
67+
rev: 0.32.1
6868
hooks:
6969
- id: check-github-workflows
7070

7171
- repo: https://github.com/astral-sh/ruff-pre-commit
72-
rev: v0.9.9
72+
rev: v0.11.4
7373
hooks:
7474
- id: ruff
7575
args: [--fix, --show-fixes]
@@ -91,7 +91,7 @@ repos:
9191
- id: rst-inline-touching-normal
9292

9393
- repo: https://github.com/scop/pre-commit-shfmt
94-
rev: v3.10.0-2
94+
rev: v3.11.0-1
9595
hooks:
9696
- id: shfmt
9797

@@ -103,6 +103,6 @@ repos:
103103
args: [--option, "reorder_arrays=true", --option, "reorder_keys=true"]
104104

105105
- repo: https://github.com/woodruffw/zizmor-pre-commit
106-
rev: v1.3.0
106+
rev: v1.5.2
107107
hooks:
108108
- id: zizmor

doc/intersphinx/pytest-objects.inv

43 Bytes
Binary file not shown.

doc/intersphinx/python-objects.inv

512 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)