14
0

Accepting request 1108094 from home:mcalabkova:branches:devel:languages:python

- add sphinx72.patch to fix tests, sent upstream

OBS-URL: https://build.opensuse.org/request/show/1108094
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-apidoc?expand=0&rev=12
This commit is contained in:
2023-08-30 11:45:36 +00:00
committed by Git OBS Bridge
parent 0940b3f97c
commit e16bf15547
3 changed files with 91 additions and 1 deletions

83
sphinx72.patch Normal file
View File

@@ -0,0 +1,83 @@
Index: sphinxcontrib-apidoc-0.3.0/tests/conftest.py
===================================================================
--- sphinxcontrib-apidoc-0.3.0.orig/tests/conftest.py
+++ sphinxcontrib-apidoc-0.3.0/tests/conftest.py
@@ -10,7 +10,7 @@ import os
import tempfile
import pytest
-from sphinx.testing.path import path
+from pathlib import Path
pytest_plugins = 'sphinx.testing.fixtures'
@@ -19,11 +19,10 @@ collect_ignore = ['roots']
@pytest.fixture(scope='session')
def sphinx_test_tempdir():
- return path(
+ return Path(
os.environ.get('SPHINX_TEST_TEMPDIR',
- tempfile.mkdtemp(prefix='apidoc-'))).abspath()
-
+ tempfile.mkdtemp(prefix='apidoc-'))).resolve()
@pytest.fixture(scope='session')
def rootdir():
- return path(os.path.dirname(__file__) or '.').abspath() / 'roots'
+ return Path(os.path.dirname(__file__) or '.').resolve() / 'roots'
Index: sphinxcontrib-apidoc-0.3.0/tests/test_ext.py
===================================================================
--- sphinxcontrib-apidoc-0.3.0.orig/tests/test_ext.py
+++ sphinxcontrib-apidoc-0.3.0/tests/test_ext.py
@@ -19,12 +19,12 @@ def test_basics(app, status, warning):
logging.setup(app, status, warning)
app.builder.build_all()
- assert (app.srcdir / 'api').isdir()
+ assert (app.srcdir / 'api').is_dir()
assert (app.srcdir / 'api' / 'modules.rst').exists()
assert (app.srcdir / 'api' / 'apidoc_dummy_module.rst').exists()
assert not (app.srcdir / 'api' / 'conf.rst').exists()
- assert (app.outdir / 'api').isdir()
+ assert (app.outdir / 'api').is_dir()
assert (app.outdir / 'api' / 'modules.html').exists()
assert (app.outdir / 'api' / 'apidoc_dummy_module.html').exists()
assert not (app.outdir / 'api' / 'conf.html').exists()
@@ -40,7 +40,7 @@ def test_advanced(app, status, warning):
logging.setup(app, status, warning)
app.builder.build_all()
- assert (app.srcdir / 'api').isdir()
+ assert (app.srcdir / 'api').is_dir()
assert (app.srcdir / 'api' / 'custom.rst').exists()
for module in [
'apidoc_dummy_module.rst',
@@ -58,7 +58,7 @@ def test_advanced(app, status, warning):
# The 'Module contents' header isn't present if '--module-first' used
assert 'Module contents' not in package_doc
- assert (app.outdir / 'api').isdir()
+ assert (app.outdir / 'api').is_dir()
assert (app.outdir / 'api' / 'custom.html').exists()
for module in [
'apidoc_dummy_module.html',
@@ -79,7 +79,7 @@ def test_advanced_negative(app, status,
logging.setup(app, status, warning)
app.builder.build_all()
- assert (app.srcdir / 'api').isdir()
+ assert (app.srcdir / 'api').is_dir()
for module in [
'apidoc_dummy_module.rst',
]:
@@ -94,7 +94,7 @@ def test_advanced_negative(app, status,
# The 'Module contents' header is present if '--module-first' isn't used
assert 'Module contents' in package_doc
- assert (app.outdir / 'api').isdir()
+ assert (app.outdir / 'api').is_dir()
for module in [
'apidoc_dummy_module.html',
]: