Skip to content

Commit 20f6a9c

Browse files
committed
Update Human to work with prompt_toolkit >= 2.00
1 parent c99dca1 commit 20f6a9c

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

axelrod/strategies/human.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
from axelrod.action import Action
44
from axelrod.player import Player
55
from prompt_toolkit import prompt
6-
from prompt_toolkit.styles import style_from_dict
7-
from prompt_toolkit.token import Token
6+
from prompt_toolkit.styles import Style
87
from prompt_toolkit.validation import ValidationError, Validator
8+
from pygments.token import Token
99

1010
C, D = Action.C, Action.D
1111

12-
toolbar_style = style_from_dict({Token.Toolbar: "#ffffff bg:#333333"})
12+
toolbar_style = Style.from_dict({"pygments.toolbar": "#ffffff bg:#333333"})
1313

1414

1515
class ActionValidator(Validator):
@@ -22,7 +22,8 @@ def validate(self, document) -> None:
2222
text = document.text
2323

2424
if text and text.upper() not in ["C", "D"]:
25-
raise ValidationError(message="Action must be C or D", cursor_position=0)
25+
raise ValidationError(message="Action must be C or D",
26+
cursor_position=0)
2627

2728

2829
class Human(Player):

docs/conf.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
import mock
1919

2020
MOCK_MODULES = [
21-
'scipy', 'scipy.stats','numpy', 'numpy.linalg', 'numpy.random',
22-
'matplotlib.pyplot', 'matplotlib','matplotlib.transforms', 'tqdm',
23-
'mpl_toolkits.axes_grid1', 'dill', 'multiprocess','prompt_toolkit',
24-
'prompt_toolkit.token', 'prompt_toolkit.styles','prompt_toolkit.validation',
25-
'pandas', 'pandas.util', 'pandas.util.decorators', 'toolz', 'toolz.curried',
26-
'toolz.functoolz', 'cloudpickle', 'dask', 'dask.dataframe']
21+
'cloudpickle', 'dask', 'dask.dataframe', 'dill', 'matplotlib',
22+
'matplotlib.pyplot', 'matplotlib.transforms', 'mpl_toolkits.axes_grid1',
23+
'multiprocess', 'numpy', 'numpy.linalg', 'numpy.random', 'pandas',
24+
'pandas.util', 'pandas.util.decorators', 'prompt_toolkit',
25+
'prompt_toolkit.styles', 'prompt_toolkit.token',
26+
'prompt_toolkit.validation', 'scipy', 'scipy.stats', 'toolz',
27+
'toolz.curried', 'toolz.functoolz', 'tqdm']
28+
2729
for mod_name in MOCK_MODULES:
2830
sys.modules[mod_name] = mock.Mock()
2931

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ hypothesis==3.2
44
matplotlib>=1.4.2,<3.0.0
55
numpy>=1.9.2
66
pandas>=0.18.1
7-
prompt-toolkit>=1.0.7,<2.0.0
7+
prompt-toolkit>=2.0.0
8+
pygments>=2.0.0
89
scipy>=0.19.0
910
toolz>=0.8.0
1011
tqdm>=3.4.0

0 commit comments

Comments
 (0)