Merge branch 'main' into dependabot/github_actions/codecov/codecov-ac…

…tion-5
pyvista · Jan 2, 2025 · f3dd1f8 · f3dd1f8
2 parents 7ab108c + 43dfc3f
commit f3dd1f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -36,7 +36,7 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@v1.1.3
         with:
-          packages: libgl1-mesa-glx xvfb
+          packages: libosmesa6-dev libgl1-mesa-dev python3-tk pandoc git-restore-mtime
           version: 3.0
 
       - name: Build Documentation
@@ -91,7 +91,7 @@ jobs:
 
       - uses: awalsh128/cache-apt-pkgs-action@v1.1.3
         with:
-          packages: libgl1-mesa-glx xvfb python-tk
+          packages: libosmesa6-dev libgl1-mesa-dev python3-tk pandoc git-restore-mtime
           version: 3.0
 
       - name: Software Report
@@ -159,7 +159,7 @@ jobs:
         run: pip install -ve .
         working-directory: pyvista
       - name: Install pyvista test requirements
-        run: pip install -v -r requirements_test.txt
+        run: pip install -v pyvista[test]
         working-directory: pyvista
       - name: Install pytest-pyvista
         run: pip install -ve .

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -44,19 +44,19 @@ repos:
 
   # this validates our github workflow files
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.29.4
+    rev: 0.30.0
     hooks:
       - id: check-github-workflows
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.2
+    rev: v0.8.1
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]
       - id: ruff-format
 
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.3.3
+    rev: v3.4.1
     hooks:
       - id: prettier
         types_or: [yaml, markdown, html, css, scss, javascript, json]
diff --git a/pytest_pyvista/pytest_pyvista.py b/pytest_pyvista/pytest_pyvista.py
@@ -203,7 +203,7 @@ def __call__(self, plotter):  # noqa: ANN001, ANN204, C901, PLR0912
             msg = f"{image_filename} does not exist in image cache"
             raise RegressionFileNotFound(msg)
 
-        if (self.add_missing_images and not os.path.isfile(image_filename) or self.reset_image_cache) and not self.reset_only_failed:  # noqa: PTH113
+        if ((self.add_missing_images and not os.path.isfile(image_filename)) or self.reset_image_cache) and not self.reset_only_failed:  # noqa: PTH113
             plotter.screenshot(image_filename)
 
         if self.generated_image_dir is not None: