Update Human to work with prompt_toolkit >= 2.00

Author: marcharper

axelrod/strategies/human.py

@@ -3,13 +3,13 @@
 from axelrod.action import Action
 from axelrod.player import Player
 from prompt_toolkit import prompt
-from prompt_toolkit.styles import style_from_dict
-from prompt_toolkit.token import Token
+from prompt_toolkit.styles import Style
 from prompt_toolkit.validation import ValidationError, Validator
+from pygments.token import Token
 
 C, D = Action.C, Action.D
 
-toolbar_style = style_from_dict({Token.Toolbar: "#ffffff bg:#333333"})
+toolbar_style = Style.from_dict({"pygments.toolbar": "#ffffff bg:#333333"})
 
 
 class ActionValidator(Validator):
@@ -22,7 +22,8 @@ def validate(self, document) -> None:
         text = document.text
 
         if text and text.upper() not in ["C", "D"]:
-            raise ValidationError(message="Action must be C or D", cursor_position=0)
+            raise ValidationError(message="Action must be C or D",
+                                  cursor_position=0)
 
 
 class Human(Player):

docs/conf.py

@@ -18,12 +18,13 @@
 import mock
 
 MOCK_MODULES = [
-    'scipy', 'scipy.stats','numpy', 'numpy.linalg', 'numpy.random',
-    'matplotlib.pyplot', 'matplotlib','matplotlib.transforms', 'tqdm',
-    'mpl_toolkits.axes_grid1', 'dill', 'multiprocess','prompt_toolkit',
-    'prompt_toolkit.token', 'prompt_toolkit.styles','prompt_toolkit.validation',
-    'pandas', 'pandas.util', 'pandas.util.decorators', 'toolz', 'toolz.curried',
-    'toolz.functoolz', 'cloudpickle', 'dask', 'dask.dataframe']
+    'dask', 'dask.dataframe', 'dill', 'matplotlib', 'matplotlib.pyplot',
+    'matplotlib.transforms', 'mpl_toolkits.axes_grid1', 'multiprocess', 'numpy',
+    'numpy.linalg', 'numpy.random', 'pandas', 'pandas.util',
+    'pandas.util.decorators', 'prompt_toolkit', 'prompt_toolkit.styles',
+    'prompt_toolkit.token', 'prompt_toolkit.validation', 'pygments', 'scipy',
+    'scipy.stats', 'toolz', 'toolz.curried', 'toolz.functoolz', 'tqdm']
+
 for mod_name in MOCK_MODULES:
     sys.modules[mod_name] = mock.Mock()
 

requirements.txt

@@ -1,10 +1,10 @@
-cloudpickle>=0.2.1
 dask>=0.18.1
 hypothesis==3.2
 matplotlib>=1.4.2,<3.0.0
 numpy>=1.9.2
 pandas>=0.18.1
-prompt-toolkit>=1.0.7,<2.0.0
+prompt-toolkit>=2.0.0
+pygments>=2.0.0
 scipy>=0.19.0
 toolz>=0.8.0
 tqdm>=3.4.0