diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2021-01-24 16:34:47 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2021-01-24 16:34:47 +0900 |
| commit | 51d500833e391c182f536e83a5d62d5e90ce8ca9 (patch) | |
| tree | fb854309b759773feb83e7e4bbc91e3ed3cb2b00 /tests/conftest.py | |
| parent | 375fb52fe402d46d633e321ce8f20c1aa61c49b9 (diff) | |
| parent | 41ee2d6e6595d0eefb4a2b752fd79a3451382d5a (diff) | |
| download | sphinx-git-51d500833e391c182f536e83a5d62d5e90ce8ca9.tar.gz | |
Merge branch '3.x' into 7774_remove_develop.rst
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 6a08dba76..5580f672b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,7 +2,7 @@ pytest config for sphinx/tests ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -13,8 +13,8 @@ import docutils import pytest import sphinx -from sphinx.testing.path import path from sphinx.testing import comparer +from sphinx.testing.path import path pytest_plugins = 'sphinx.testing.fixtures' |