Skip to content

Commit e52cdd2

Browse files
jkseppanjkseppan
committed
Import the pytest hooks in the other conftest.py files
This way py.test lib/matplotlib/tests/test_artist.py --conversion-cache-report-misses -n 2 works for me even though the options don't get documented in "py.test --help".
1 parent 6007b37 commit e52cdd2

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

‎lib/matplotlib/sphinxext/tests/conftest.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
from matplotlib.testing.conftest import (mpl_test_settings,
5-
pytest_configure, pytest_unconfigure)
4+
from matplotlib.testing.conftest import (
5+
mpl_test_settings, pytest_addoption, pytest_configure, pytest_unconfigure,
6+
pytest_sessionfinish, pytest_terminal_summary)

‎lib/matplotlib/tests/conftest.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
from matplotlib.testing.conftest import (mpl_test_settings,
5-
pytest_configure, pytest_unconfigure)
4+
from matplotlib.testing.conftest import (
5+
mpl_test_settings, pytest_addoption, pytest_configure, pytest_unconfigure,
6+
pytest_sessionfinish, pytest_terminal_summary)
7+

‎lib/mpl_toolkits/tests/conftest.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
from matplotlib.testing.conftest import (mpl_test_settings,
5-
pytest_configure, pytest_unconfigure)
4+
from matplotlib.testing.conftest import (
5+
mpl_test_settings, pytest_addoption, pytest_configure, pytest_unconfigure,
6+
pytest_sessionfinish, pytest_terminal_summary)

0 commit comments

Comments
 (0)