Skip to content

Commit d72b547

Browse files
committed
Revert debugging helpers
1 parent 93eabad commit d72b547

File tree

1 file changed

+10
-40
lines changed

1 file changed

+10
-40
lines changed

pandas/tests/plotting/test_datetimelike.py

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
import pytest
77
from pandas.compat import lrange, zip
8-
try:
9-
import matplotlib
10-
except:
11-
pass
128

139
import numpy as np
1410
from pandas import Index, Series, DataFrame, NaT, isna
@@ -429,9 +425,6 @@ def test_finder_daily(self):
429425
rs2.append(xaxis.get_majorticklocs()[0])
430426
self.plt.close(ax.get_figure())
431427

432-
if rs1 != xpl1 or rs2 != xpl2:
433-
print(matplotlib.__version__, np.__version__,
434-
rs1, xpl1, rs2, xpl2)
435428
assert rs1 == xpl1
436429
assert rs2 == xpl2
437430

@@ -461,9 +454,6 @@ def test_finder_quarterly(self):
461454
rs2.append(xaxis.get_majorticklocs()[0])
462455
self.plt.close(ax.get_figure())
463456

464-
if rs1 != xpl1 or rs2 != xpl2:
465-
print(matplotlib.__version__, np.__version__,
466-
rs1, xpl1, rs2, xpl2)
467457
assert rs1 == xpl1
468458
assert rs2 == xpl2
469459

@@ -493,9 +483,6 @@ def test_finder_monthly(self):
493483
rs2.append(xaxis.get_majorticklocs()[0])
494484
self.plt.close(ax.get_figure())
495485

496-
if rs1 != xpl1 or rs2 != xpl2:
497-
print(matplotlib.__version__, np.__version__,
498-
rs1, xpl1, rs2, xpl2)
499486
assert rs1 == xpl1
500487
assert rs2 == xpl2
501488

@@ -528,8 +515,6 @@ def test_finder_annual(self):
528515
rs.append(xaxis.get_majorticklocs()[0])
529516
self.plt.close(ax.get_figure())
530517

531-
if rs != xp:
532-
print(matplotlib.__version__, np.__version__, rs, xp)
533518
assert rs == xp
534519

535520
@pytest.mark.slow
@@ -542,8 +527,7 @@ def test_finder_minutely(self):
542527
xaxis = ax.get_xaxis()
543528
rs = xaxis.get_majorticklocs()[0]
544529
xp = Period('1/1/1999', freq='Min').ordinal
545-
if rs != xp:
546-
print(matplotlib.__version__, np.__version__, rs, xp)
530+
547531
assert rs == xp
548532

549533
def test_finder_hourly(self):
@@ -556,10 +540,9 @@ def test_finder_hourly(self):
556540
rs = xaxis.get_majorticklocs()[0]
557541
if self.mpl_ge_2_0_1:
558542
xp = Period('1/1/1999', freq='H').ordinal
559-
else:
543+
else: # 2.0.0
560544
xp = Period('1998-12-31 22:00', freq='H').ordinal
561-
if rs != xp:
562-
print(matplotlib.__version__, np.__version__, rs, xp)
545+
563546
assert rs == xp
564547

565548
@pytest.mark.slow
@@ -575,8 +558,7 @@ def test_gaps(self):
575558
if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
576559
# 2.0.0 or >= 3.0.0
577560
data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
578-
if not isinstance(data, np.ma.core.MaskedArray):
579-
print(matplotlib.__version__, np.__version__, type(data))
561+
580562
assert isinstance(data, np.ma.core.MaskedArray)
581563
mask = data.mask
582564
assert mask[5:25, 1].all()
@@ -595,8 +577,7 @@ def test_gaps(self):
595577
if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
596578
# 2.0.0 or >= 3.0.0
597579
data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
598-
if not isinstance(data, np.ma.core.MaskedArray):
599-
print(matplotlib.__version__, np.__version__, type(data))
580+
600581
assert isinstance(data, np.ma.core.MaskedArray)
601582
mask = data.mask
602583
assert mask[2:5, 1].all()
@@ -615,9 +596,7 @@ def test_gaps(self):
615596
if self.mpl_ge_3_0_0 or not self.mpl_ge_2_0_1:
616597
# 2.0.0 or >= 3.0.0
617598
data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
618-
if not isinstance(data, np.ma.core.MaskedArray):
619-
print(matplotlib.__version__, np.__version__, type(data))
620-
print(data)
599+
621600
assert isinstance(data, np.ma.core.MaskedArray)
622601
mask = data.mask
623602
assert mask[2:5, 1].all()
@@ -641,9 +620,6 @@ def test_gap_upsample(self):
641620
# 2.0.0 or >= 3.0.0
642621
data = np.ma.MaskedArray(data, mask=isna(data), fill_value=np.nan)
643622

644-
if not isinstance(data, np.ma.core.MaskedArray):
645-
print(matplotlib.__version__, np.__version__, type(data))
646-
print(data)
647623
assert isinstance(data, np.ma.core.MaskedArray)
648624
mask = data.mask
649625
assert mask[5:25, 1].all()
@@ -1428,12 +1404,9 @@ def test_format_timedelta_ticks_narrow(self):
14281404
df.plot(fontsize=2, ax=ax)
14291405
fig.canvas.draw()
14301406
labels = ax.get_xticklabels()
1431-
if len(labels) != len(expected_labels):
1432-
print(matplotlib.__version__, np.__version__,
1433-
[str(x) for x in labels], expected_labels)
1407+
14341408
assert len(labels) == len(expected_labels)
1435-
for l, l_expected in zip(labels, expected_labels):
1436-
assert l.get_text() == l_expected
1409+
assert [x.get_text() for x in labels] == expected_labels
14371410

14381411
def test_format_timedelta_ticks_wide(self):
14391412
expected_labels = [
@@ -1464,12 +1437,9 @@ def test_format_timedelta_ticks_wide(self):
14641437
ax = df.plot(fontsize=2, ax=ax)
14651438
fig.canvas.draw()
14661439
labels = ax.get_xticklabels()
1467-
if len(labels) != len(expected_labels):
1468-
print(matplotlib.__version__, np.__version__,
1469-
[str(x) for x in labels], expected_labels)
1440+
14701441
assert len(labels) == len(expected_labels)
1471-
for l, l_expected in zip(labels, expected_labels):
1472-
assert l.get_text() == l_expected
1442+
assert [x.get_text() for x in labels] == expected_labels
14731443

14741444
def test_timedelta_plot(self):
14751445
# test issue #8711

0 commit comments

Comments
 (0)