Skip to content

Commit ce0f161

Browse files
authored
Merge pull request #800 from Axelrod-Python/py3.6
Change python support from 3.4/3.5 to 3.5/3.6
2 parents e15b86e + f2c9697 commit ce0f161

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
language: python
33
python:
4-
- 3.4
54
- 3.5
5+
- 3.6
66

77
cache:
88
directories:
@@ -15,7 +15,7 @@ install:
1515
- pip install -r requirements.txt
1616
- pip install sphinx
1717
- pip install sphinx_rtd_theme
18-
- pip install docutils==0.12
18+
- pip install docutils==0.12
1919
- pip install coverage
2020
- pip install coveralls
2121
script:

docs/tutorials/further_topics/spatial_tournaments.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ and obtain the interactions::
5151

5252
>>> spatial_tournament = axl.SpatialTournament(players ,turns=2, repetitions=2, edges=edges)
5353
>>> results = spatial_tournament.play(keep_interactions=True)
54-
>>> for index_pair, interaction in results.interactions.items():
54+
>>> for index_pair, interaction in sorted(results.interactions.items()):
5555
... player1 = spatial_tournament.players[index_pair[0]]
5656
... player2 = spatial_tournament.players[index_pair[1]]
5757
... print('%s vs %s: %s' % (player1, player2, interaction))
58-
Defector vs Tit For Tat: [[('D', 'C'), ('D', 'D')], [('D', 'C'), ('D', 'D')]]
58+
Cooperator vs Tit For Tat: [[('C', 'C'), ('C', 'C')], [('C', 'C'), ('C', 'C')]]
5959
Cooperator vs Grudger: [[('C', 'C'), ('C', 'C')], [('C', 'C'), ('C', 'C')]]
60+
Defector vs Tit For Tat: [[('D', 'C'), ('D', 'D')], [('D', 'C'), ('D', 'D')]]
6061
Defector vs Grudger: [[('D', 'C'), ('D', 'D')], [('D', 'C'), ('D', 'D')]]
61-
Cooperator vs Tit For Tat: [[('C', 'C'), ('C', 'C')], [('C', 'C'), ('C', 'C')]]
6262

6363
As anticipated :code:`Cooperator` does not interact with :code:`Defector` neither
6464
:code:`TitForTat` with :code:`Grudger`.

0 commit comments

Comments
 (0)