Skip to content

Commit f00dc15

Browse files
committed
Fix test failures
1 parent ce44877 commit f00dc15

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,20 @@ jobs:
3131

3232
steps:
3333
- uses: actions/checkout@v3
34-
- name: Setup Python ${{ matrix.python }}
34+
- name: Set up Python ${{ matrix.python }}
3535
uses: actions/setup-python@v4
36+
if: "!endsWith(matrix.python, '-dev')"
37+
with:
38+
python-version: ${{ matrix.python }}
39+
- name: Set up Python ${{ matrix.python }} (deadsnakes)
40+
uses: deadsnakes/action@v2.1.1
41+
if: "endsWith(matrix.python, '-dev')"
3642
with:
3743
python-version: ${{ matrix.python }}
3844
- name: Install dependencies
3945
run: |
4046
python -m pip install --upgrade pip
41-
python -m pip install --upgrade pytest
47+
python -m pip install .[test]
4248
python -m pip install "Sphinx @ git+https://github.com/sphinx-doc/sphinx"
4349
4450
- name: Test with pytest

tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
:license: BSD, see LICENSE for details.
77
"""
88

9-
import pytest
9+
from pathlib import Path
1010

11-
from sphinx.testing.path import path
11+
import pytest
1212

1313
pytest_plugins = 'sphinx.testing.fixtures'
1414

1515

1616
@pytest.fixture(scope='session')
1717
def rootdir():
18-
return path(__file__).parent.abspath() / 'roots'
18+
return Path(__file__).resolve().parent / 'roots'

0 commit comments

Comments
 (0)