10000 TST: dregister pandas (#13304) · matplotlib/matplotlib@c2ff409 · GitHub
[go: up one dir, main page]

Skip to content

Commit c2ff409

Browse files
jklymakdstansby
authored andcommitted
TST: dregister pandas (#13304)
1 parent 5a53f5e commit c2ff409

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

lib/matplotlib/testing/conftest.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,8 @@ def pd():
9191
pd = pytest.importorskip('pandas')
9292
try:
9393
from pandas.plotting import (
94-
register_matplotlib_converters as register)
94+
deregister_matplotlib_converters as deregister)
95+
deregister()
9596
except ImportError:
96-
from pandas.tseries.converter import register
97-
register()
98-
try:
99-
yield pd
100-
finally:
101-
try:
102-
from pandas.plotting import (
103-
deregister_matplotlib_converters as deregister)
104-
except ImportError:
105-
pass
106-
else:
107-
deregister()
97+
pass
98+
return pd

0 commit comments

Comments
 (0)
0