From 48d572c14eb7e578f9b2cd494709a2b94e3c2e3a Mon Sep 17 00:00:00 2001 From: katherinekolman Date: Mon, 18 May 2020 14:43:16 -0500 Subject: [PATCH] Revert test to original + force matplotlib version to 3.2.0 --- .travis.yml | 2 +- uwsift/tests/view/test_export_image.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5762efbf..63f7a47d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ env: global: - NUMPY_VERSION=stable - MAIN_CMD='python setup.py' - - CONDA_DEPENDENCIES='hdf5 rasterio matplotlib numba pyproj coveralls pytest pytest-mock + - CONDA_DEPENDENCIES='hdf5 rasterio matplotlib==3.2.0 numba pyproj coveralls pytest pytest-mock pytest-cov coverage pytest-qt vispy netcdf4 h5py imageio imageio-ffmpeg ffmpeg pillow pyshp pyqtgraph shapely sqlalchemy pyqt appdirs pyyaml satpy eccodes scikit-image donfig conda-pack' diff --git a/uwsift/tests/view/test_export_image.py b/uwsift/tests/view/test_export_image.py index d732b093..7cd70045 100644 --- a/uwsift/tests/view/test_export_image.py +++ b/uwsift/tests/view/test_export_image.py @@ -121,7 +121,7 @@ def test_create_colorbar(size, mode, exp, monkeypatch, window): @pytest.mark.parametrize("mode,cbar_size,exp", [ (None, (0, 0), (100, 100)), ('vertical', (10, 120), (108, 100)), - ('horizontal', (120, 10), (100, 109)), + ('horizontal', (120, 10), (100, 108)), ]) def test_append_colorbar(mode, cbar_size, exp, monkeypatch, window): """Test colorbar is appended to the appropriate location given the colorbar append direction."""