[#894] Merge commit '4d19db828ea0ee9d3e08b6e767aa2fe0bb163b18' into issue-894

* commit '4d19db828ea0ee9d3e08b6e767aa2fe0bb163b18':
  Remove anti pattern.
  Add another test.
  Use distutils version comparison.

Author: meatballs

axelrod/plot.py

@@ -3,6 +3,7 @@
 import tqdm
 import warnings
 
+from distutils.version import LooseVersion
 from typing import List, Union
 
 matplotlib_installed = True
@@ -27,16 +28,9 @@
 
 def default_cmap(version: str = None) -> str:
     """Sets a default matplotlib colormap based on the version."""
-    version_gt_1_5 = False
-    if version:
-        s = version.split('.')
-        version_gt_1_5 = (int(s[0]) == 1 and int(s[1]) >= 5) or (int(s[0]) > 1)
-
-    cmaps = {
-        True: 'viridis',
-        False: 'YlGnBu'
-    }
-    return cmaps[version_gt_1_5]
+    if version is None or LooseVersion(version) >= "1.5":
+        return 'viridis'
+    return 'YlGnBu'
 
 
 class Plot(object):

axelrod/tests/unit/test_plot.py

@@ -74,15 +74,27 @@ def setUpClass(cls):
             ['Defector', 'Tit For Tat', 'Alternator'])
 
     def test_default_cmap(self):
-        cmap = axelrod.plot.default_cmap()
+        cmap = axelrod.plot.default_cmap('0.0')
         self.assertEqual(cmap, 'YlGnBu')
 
-        cmap = axelrod.plot.default_cmap('0.0')
+        cmap = axelrod.plot.default_cmap('1.3alpha')
+        self.assertEqual(cmap, 'YlGnBu')
+
+        cmap = axelrod.plot.default_cmap('1.4.99')
         self.assertEqual(cmap, 'YlGnBu')
 
         cmap = axelrod.plot.default_cmap('1.4')
         self.assertEqual(cmap, 'YlGnBu')
 
+        cmap = axelrod.plot.default_cmap()
+        self.assertEqual(cmap, 'viridis')
+
+        cmap = axelrod.plot.default_cmap('1.5')
+        self.assertEqual(cmap, 'viridis')
+
+        cmap = axelrod.plot.default_cmap('1.5beta')
+        self.assertEqual(cmap, 'viridis')
+
         cmap = axelrod.plot.default_cmap('1.7')
         self.assertEqual(cmap, 'viridis')