Fix test failures

.github/workflows/test.yml

@@ -31,14 +31,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup Python ${{ matrix.python }}
+      - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v4
+        if: "!endsWith(matrix.python, '-dev')"
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Set up Python ${{ matrix.python }} (deadsnakes)
+        uses: deadsnakes/action@v2.1.1
+        if: "endsWith(matrix.python, '-dev')"
         with:
           python-version: ${{ matrix.python }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --upgrade pytest
+          python -m pip install .[test]
           python -m pip install "Sphinx @ git+https://github.com/sphinx-doc/sphinx"
 
       - name: Test with pytest

sphinxcontrib/qthelp/__init__.py

@@ -243,17 +243,14 @@ def build_keywords(self, title: str, refs: List[Any], subitems: Any) -> List[str
         return keywords
 
     def get_project_files(self, outdir: str) -> List[str]:
-        if not outdir.endswith(os.sep):
-            outdir += os.sep
-        olen = len(outdir)
         project_files = []
         staticdir = path.join(outdir, '_static')
         imagesdir = path.join(outdir, self.imagedir)
         for root, dirs, files in os.walk(outdir):
             resourcedir = root.startswith((staticdir, imagesdir))
             for fn in sorted(files):
                 if (resourcedir and not fn.endswith('.js')) or fn.endswith('.html'):
-                    filename = path.join(root, fn)[olen:]
+                    filename = path.relpath(path.join(root, fn), outdir)
                     project_files.append(canon_path(filename))
 
         return project_files

tests/conftest.py

@@ -6,13 +6,13 @@
     :license: BSD, see LICENSE for details.
 """
 
-import pytest
+from pathlib import Path
 
-from sphinx.testing.path import path
+import pytest
 
 pytest_plugins = 'sphinx.testing.fixtures'
 
 
 @pytest.fixture(scope='session')
 def rootdir():
-    return path(__file__).parent.abspath() / 'roots'
+    return Path(__file__).resolve().parent / 'roots'