Merge 8471d09312 into d868699bab

.github/workflows/ci.yml

@@ -479,9 +479,7 @@ jobs:
           #     protocol specified". However, we have verified with strace(1)
           #     that the command in the Podman container can read the Xauthority
           #     file successfully.
-          xvfb-run -s '-ac' ./dev_scripts/env.py --distro ${{ matrix.distro }} --version ${{ matrix.version }} run --dev \
-<<<<<<< HEAD
-              bash -c 'cd dangerzone; poetry run make test'
+          xvfb-run -s '-ac' ./dev_scripts/env.py --distro ${{ matrix.distro }} --version ${{ matrix.version }} run --dev \             bash -c 'cd dangerzone; uv run --group test make test'
       
       - name: Upload PDF diffs
         uses: actions/upload-artifact@v4
@@ -490,6 +488,3 @@ jobs:
           path: tests/test_docs/diffs/*.jpeg
         # Always run this step to publish test results, even on failures
         if: ${{ always() }}
-=======
-              bash -c 'cd dangerzone; uv run --group test make test'
->>>>>>> dfca32c (Use uv rather than poetry wherever possible)