Merge branch 'main' into failfast

Author: TimMonko

.github/workflows/test.yml

@@ -27,15 +27,16 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      # these libraries enable testing on Qt on linux
-      - uses: tlambert03/setup-qt-libs@19e4ef2d781d81f5f067182e228b54ec90d23b76 # v1.8
+      - name: Setup headless screenL
+        uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
+        with:
+          qt: true
+          wm: herbstluftwm
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install -r requirements.txt
 
       - name: Test
-        uses: aganders3/headless-gui@f85dd6316993505dfc5f21839d520ae440c84816 # v2.2
-        with:
-          run: python -m pytest -s -v --color=yes
+        run: python -m pytest -s -v --color=yes

README.md

@@ -330,10 +330,10 @@ Tests are automatically setup to run on GitHub when you push changes to your rep
 
 You may also run your tests locally with [pytest](https://docs.pytest.org/en/7.1.x/).
 You'll need to make sure that your package is installed in your environment,
-along with testing requirements (specified in the pyproject.toml `project.optional-dependencies` section):
+along with testing requirements (specified in the pyproject.toml `[dependency-groups]` section):
 
 ```bash
-pip install -e ".[testing]"
+pip install -e ". --dependency-groups=testing"
 pytest
 ```
 

template/.github/workflows/test_and_deploy.yml

@@ -41,12 +41,12 @@ jobs:
       # these libraries enable testing on Qt on linux
       - uses: tlambert03/setup-qt-libs@v1
 
-      # strategy borrowed from vispy for installing opengl libs on windows
       - name: Install Windows OpenGL
-        if: runner.os == 'Windows'
-        run: |
-          git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
-          powershell gl-ci-helpers/appveyor/install_opengl.ps1
+        uses: pyvista/setup-headless-display-action@v4.v2
+        with:
+          qt: true
+          wm: herbstluftwm
+
 
       # note: if you need dependencies from conda, considering using
       # setup-miniconda: https://github.com/conda-incubator/setup-miniconda
@@ -59,9 +59,7 @@ jobs:
 
       # this runs the platform-specific tests declared in tox.ini
       - name: Test with tox
-        uses: aganders3/headless-gui@v2
-        with:
-          run: python -m tox
+        run: python -m tox
         env:
           PLATFORM: ${{ matrix.platform }}
 

template/pyproject.toml.jinja

@@ -51,6 +51,8 @@ dependencies = [
 # Allow easily installation with the full, default napari installation
 # (including Qt backend) using {{plugin_name}}[all].
 all = ["napari[all]"]
+
+[dependency-groups]
 testing = [
     "tox",
     "pytest",  # https://docs.pytest.org/en/latest/contents.html

template/tox.ini.jinja

@@ -28,6 +28,6 @@ passenv =
     XAUTHORITY
     NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
     PYVISTA_OFF_SCREEN
-extras =
+dependency_groups =
     testing
 commands = pytest -v --color=yes --cov={{module_name}} --cov-report=xml