Merge pull request #118 from sroet/fix_cmap_test

Actually test for the Userwarning on custom cmaps
dwhswenson · Jul 26, 2021 · 12b1610 · 12b1610
2 parents 914dfe1 + 0ff331d
commit 12b1610
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,15 +14,9 @@ environment:
     PYTHONUNBUFFERED: 1
 
   matrix:
-    #- PYTHON: "C:\\Miniconda38-x64"
-      #CONDA_PY: "38" 
-      #ARCH: '64'
     - PYTHON: "C:\\Miniconda37-x64"
       CONDA_PY: "37"
       ARCH: '64'
-    - PYTHON: "C:\\Miniconda36-x64"
-      CONDA_PY: "36" 
-      ARCH: '64'
 
 build: false
 

diff --git a/contact_map/tests/test_plot_utils.py b/contact_map/tests/test_plot_utils.py
@@ -14,6 +14,7 @@
 else:
     HAS_MATPLOTLIB = True
 
+
 @pytest.mark.parametrize("val", [0.5, 0.55, 0.6, 0.65, 0.7])
 @pytest.mark.parametrize("map_type", ["name", "cmap"])
 def test_ranged_colorbar_cmap(map_type, val):
@@ -33,39 +34,41 @@ def test_ranged_colorbar_cmap(map_type, val):
     assert_allclose(cb.cmap(cb.norm(val)), default_cmap(norm(val)),
                     atol=atol)
 
+
 @pytest.mark.parametrize("cmap", ['seismic', 'Blues', 'custom'])
 def test_is_cmap_diverging(cmap):
     custom = None
+
     if HAS_MATPLOTLIB:
         custom = LinearSegmentedColormap(
             'testCmap',
             segmentdata={
                 'red':   [[0.0,  0.0, 0.0],
                           [0.5,  1.0, 1.0],
                           [1.0,  1.0, 1.0]],
-                 'green': [[0.0,  0.0, 0.0],
-                           [0.25, 0.0, 0.0],
-                           [0.75, 1.0, 1.0],
-                           [1.0,  1.0, 1.0]],
-                 'blue':  [[0.0,  0.0, 0.0],
-                           [0.5,  0.0, 0.0],
-                           [1.0,  1.0, 1.0]]},
+                'green': [[0.0,  0.0, 0.0],
+                          [0.25, 0.0, 0.0],
+                          [0.75, 1.0, 1.0],
+                          [1.0,  1.0, 1.0]],
+                'blue':  [[0.0,  0.0, 0.0],
+                          [0.5,  0.0, 0.0],
+                          [1.0,  1.0, 1.0]]},
             N=256
         )
     elif cmap == 'custom':
         # no matplotlib; can't do custom
         pytest.skip()
 
-    cmap, expected = {
+    color_map, expected = {
         'seismic': ('seismic', True),
         'Blues': ('Blues', False),
         'custom': (custom, False),
     }[cmap]
     if cmap == 'custom':
-        with pytest.warns(UserWarning):
-            assert is_cmap_diverging(cmap) == expected
+        with pytest.warns(UserWarning, match="Unknown colormap"):
+            assert is_cmap_diverging(color_map) == expected
     else:
-        assert is_cmap_diverging(cmap) == expected
+        assert is_cmap_diverging(color_map) == expected
 
 
 class TestContactRange(object):