Fix test failures

Author: AA-Turner

.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

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'

tests/test_applehelp.py

@@ -8,12 +8,11 @@
     :license: BSD, see LICENSE for details.
 """
 
+from pathlib import Path
 import plistlib
 
 import pytest
 
-from sphinx.testing.path import path
-
 
 def check_structure(outdir):
     contentsdir = outdir / 'Contents'
@@ -40,13 +39,13 @@ def check_localization(outdir):
     confoverrides={'applehelp_bundle_id': 'org.sphinx-doc.Sphinx.help',
                    'applehelp_disable_external_tools': True})
 def test_applehelp_output(app, status, warning):
-    (app.srcdir / 'en.lproj').makedirs()
-    (app.srcdir / 'en.lproj' / 'localized.txt').write_text('')
+    (app.srcdir / 'en.lproj').mkdir(parents=True, exist_ok=True)
+    (app.srcdir / 'en.lproj' / 'localized.txt').touch()
     app.builder.build_all()
 
     # Have to use bundle_path, not outdir, because we alter the latter
     # to point to the lproj directory so that the HTML arrives in the
     # correct location.
-    bundle_path = path(app.builder.bundle_path)
+    bundle_path = Path(app.builder.bundle_path)
     check_structure(bundle_path)
     check_localization(bundle_path)