From bdccfebd76345c9b8d0dfa0765b6377ce31e5cf7 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 19 Jul 2019 23:02:43 +0100 Subject: [PATCH 1/2] Don't use pandas 0.25.0 for testing --- lib/matplotlib/tests/test_axes.py | 2 -- requirements/testing/travis36.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 85b220c2d1d7..2a88d258befa 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -1610,11 +1610,9 @@ def test_bar_pandas(pd): forecast = monthly['value'] baseline = monthly['value'] - pd.plotting.register_matplotlib_converters() fig, ax = plt.subplots() ax.bar(dates, forecast, width=10, align='center') ax.plot(dates, baseline, color='orange', lw=4) - pd.plotting.deregister_matplotlib_converters() @image_comparison(['hist_log'], remove_text=True) diff --git a/requirements/testing/travis36.txt b/requirements/testing/travis36.txt index 0667058cd533..6b961fb5a6e4 100644 --- a/requirements/testing/travis36.txt +++ b/requirements/testing/travis36.txt @@ -2,5 +2,5 @@ ipykernel nbconvert[execute] -pandas +pandas!=0.25.0 pytz From 5ad791e649093704ed45288a23a89bf01225f5e4 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sat, 20 Jul 2019 18:22:34 +0100 Subject: [PATCH 2/2] Exclude appveyor pandas version --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ebc2cb9cba0d..01f9b6977d83 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -63,11 +63,11 @@ install: # - conda create -q -n test-environment python=%PYTHON_VERSION% msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5 - pip setuptools numpy pandas sphinx tornado + pip setuptools numpy sphinx tornado - activate test-environment - echo %PYTHON_VERSION% %TARGET_ARCH% # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124 - - pip install -q "pytest>=3.4,!=4.6.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist + - pip install -q "pytest>=3.4,!=4.6.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist "pandas!=0.25.0" # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3 # https://github.com/matplotlib/matplotlib/issues/9176