Revert test to original + force matplotlib version to 3.2.0

ssec · May 18, 2020 · 48d572c · 48d572c
1 parent 570a83b
commit 48d572c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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."""