From a61a227fad5ca55ed28d15cc433d3baa185385ea Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 7 Jun 2019 15:35:16 -0500 Subject: [PATCH 1/4] TST: skip assert for mpl 3.1+ --- pandas/tests/plotting/common.py | 1 + pandas/tests/plotting/test_frame.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pandas/tests/plotting/common.py b/pandas/tests/plotting/common.py index 2cd80c3bd944b..3ebeee3cefc31 100644 --- a/pandas/tests/plotting/common.py +++ b/pandas/tests/plotting/common.py @@ -36,6 +36,7 @@ def setup_method(self, method): self.mpl_ge_2_2_3 = plotting._compat._mpl_ge_2_2_3() self.mpl_ge_3_0_0 = plotting._compat._mpl_ge_3_0_0() + self.mpl_ge_3_1_0 = plotting._compat._mpl_ge_3_1_0() self.bp_n_objects = 7 self.polycollection_factor = 2 diff --git a/pandas/tests/plotting/test_frame.py b/pandas/tests/plotting/test_frame.py index 9a2b87558b869..9c7a0abf981d1 100644 --- a/pandas/tests/plotting/test_frame.py +++ b/pandas/tests/plotting/test_frame.py @@ -383,8 +383,10 @@ def test_subplots(self): for ax in axes[:-2]: self._check_visible(ax.xaxis) # xaxis must be visible for grid self._check_visible(ax.get_xticklabels(), visible=False) - self._check_visible( - ax.get_xticklabels(minor=True), visible=False) + if not (kind == 'bar' and self.mpl_ge_3_1_0): + # change https://github.com/pandas-dev/pandas/issues/26714 + self._check_visible( + ax.get_xticklabels(minor=True), visible=False) self._check_visible(ax.xaxis.get_label(), visible=False) self._check_visible(ax.get_yticklabels()) From 4e1ab966dfc70a4d1da4219e68409bf9e5ec56f9 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 7 Jun 2019 16:34:52 -0500 Subject: [PATCH 2/4] MPL compat --- pandas/tests/plotting/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/plotting/common.py b/pandas/tests/plotting/common.py index 3ebeee3cefc31..f4dc9d5db4018 100644 --- a/pandas/tests/plotting/common.py +++ b/pandas/tests/plotting/common.py @@ -441,9 +441,9 @@ def _check_grid_settings(self, obj, kinds, kws={}): import matplotlib as mpl def is_grid_on(): - xoff = all(not g.gridOn + xoff = all(not g.gridline.get_visible() for g in self.plt.gca().xaxis.get_major_ticks()) - yoff = all(not g.gridOn + yoff = all(not g.gridline.get_visible() for g in self.plt.gca().yaxis.get_major_ticks()) return not (xoff and yoff) From 35d058e10df9f91adb75723916b09e87262c8ef3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 7 Jun 2019 21:52:46 -0500 Subject: [PATCH 3/4] remove pyarrow --- ci/deps/travis-36-cov.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 606b5bac8306d..afd9877afdf84 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -20,7 +20,8 @@ dependencies: # https://github.com/pydata/pandas-gbq/issues/271 - google-cloud-bigquery<=1.11 - psycopg2 - - pyarrow=0.9.0 + # pyarrow segfaults on load: https://github.com/pandas-dev/pandas/issues/26716 + # - pyarrow=0.9.0 - pymysql - pytables - python-snappy From 460b8eb4989226dd03bb896c7264617bc8fb5311 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 7 Jun 2019 22:44:34 -0500 Subject: [PATCH 4/4] mpl compat --- pandas/tests/plotting/common.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pandas/tests/plotting/common.py b/pandas/tests/plotting/common.py index f4dc9d5db4018..7b108157096b3 100644 --- a/pandas/tests/plotting/common.py +++ b/pandas/tests/plotting/common.py @@ -441,10 +441,18 @@ def _check_grid_settings(self, obj, kinds, kws={}): import matplotlib as mpl def is_grid_on(): - xoff = all(not g.gridline.get_visible() - for g in self.plt.gca().xaxis.get_major_ticks()) - yoff = all(not g.gridline.get_visible() - for g in self.plt.gca().yaxis.get_major_ticks()) + xticks = self.plt.gca().xaxis.get_major_ticks() + yticks = self.plt.gca().yaxis.get_major_ticks() + # for mpl 2.2.2, gridOn and gridline.get_visible disagree. + # for new MPL, they are the same. + + if self.mpl_ge_3_0_0: + xoff = all(not g.gridline.get_visible() for g in xticks) + yoff = all(not g.gridline.get_visible() for g in yticks) + else: + xoff = all(not g.gridOn for g in xticks) + yoff = all(not g.gridOn for g in yticks) + return not (xoff and yoff) spndx = 1