Skip to content

Commit

Permalink
[useblocks#69] remove deprecation warnings from sphinx
Browse files Browse the repository at this point in the history
  • Loading branch information
kreuzberger committed Jan 12, 2024
1 parent 7cab1e1 commit 1543578
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion sphinxcontrib/test_reports/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

sphinx_version = sphinx.__version__
if parse_version(sphinx_version) >= parse_version("1.6"):
from sphinx.util import status_iterator # NOQA Sphinx 1.5
from sphinx.util.display import status_iterator # NOQA Sphinx 1.5

STATICS_DIR_NAME = "_static"

Expand Down
10 changes: 5 additions & 5 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
from tempfile import mkdtemp

import pytest
from sphinx.testing.path import path
from pathlib import Path

pytest_plugins = "sphinx.testing.fixtures"


def copy_srcdir_to_tmpdir(srcdir, tmp):
srcdir = path(__file__).parent.abspath() / srcdir
tmproot = tmp / path(srcdir).basename()
srcdir = Path(__file__).parent.absolute() / srcdir
tmproot = tmp / Path(srcdir).name
shutil.copytree(srcdir, tmproot)
return tmproot

Expand All @@ -19,12 +19,12 @@ def copy_srcdir_to_tmpdir(srcdir, tmp):
def test_app(make_app, request):
# We create a temp-folder on our own, as the util-functions from sphinx and pytest make troubles.
# It seems like they reuse certain-temp names
sphinx_test_tempdir = path(mkdtemp())
sphinx_test_tempdir = Path(mkdtemp())

builder_params = request.param

# copy plantuml.jar, xml files and json files to current test temdir
util_files = path(__file__).parent.abspath() / "doc_test/utils"
util_files = Path(__file__).parent.absolute() / "doc_test/utils"
shutil.copytree(util_files, sphinx_test_tempdir / "utils")

# copy test srcdir to test temporary directory sphinx_test_tempdir
Expand Down

0 comments on commit 1543578

Please sign in to comment.