diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-02-20 00:02:57 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-02-20 00:02:57 +0900 |
| commit | 938ba386ed84f7fd3a106233ce52c52be5553dc7 (patch) | |
| tree | 59c859904ed9df8f72d21ba701dcc82944b605da /tests/conftest.py | |
| parent | c95f538913010ab2efb00890a4adc3be01f77a4b (diff) | |
| parent | 63f6603297fb0f38aa45882eb29328fe5208b37d (diff) | |
| download | sphinx-git-938ba386ed84f7fd3a106233ce52c52be5553dc7.tar.gz | |
Merge branch '1.7'
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 67560d009..eef0cb185 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,9 +10,9 @@ import os import shutil import sys -import warnings import pytest + from sphinx.testing.path import path pytest_plugins = 'sphinx.testing.fixtures' |