Skip to content

Commit 423b59f

Browse files
committed
Cleanup post rebase, update some imports
1 parent bad199e commit 423b59f

30 files changed

+68
-101
lines changed

axelrod/evolvable_player.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import base64
2-
import copy
32
from pickle import dumps, loads
43
from typing import Dict, List
54
from .player import Player

axelrod/match.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from axelrod import Classifiers
77
from axelrod.game import Game
88
from axelrod.random_ import RandomGenerator
9-
from .deterministic_cache import DeterministicCache
9+
from axelrod.deterministic_cache import DeterministicCache
1010

1111
C, D = Action.C, Action.D
1212

axelrod/moran.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import numpy as np
88
from axelrod import EvolvablePlayer, DEFAULT_TURNS, Game, Player
99

10-
from .deterministic_cache import DeterministicCache
11-
from .graph import Graph, complete_graph
12-
from .match import Match
13-
from .random_ import RandomGenerator, BulkRandomGenerator
10+
from axelrod.deterministic_cache import DeterministicCache
11+
from axelrod.graph import Graph, complete_graph
12+
from axelrod.match import Match
13+
from axelrod.random_ import RandomGenerator, BulkRandomGenerator
1414

1515

1616
class MoranProcess(object):

axelrod/plot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from distutils.version import LooseVersion
2+
import pathlib
23
from typing import List, Union
34

45
import matplotlib
56
import matplotlib.pyplot as plt
67
import matplotlib.transforms as transforms
7-
import pathlib
8-
import tqdm
98
from numpy import arange, median, nan_to_num
9+
import tqdm
1010

1111
from .result_set import ResultSet
1212
from .load_data_ import axl_filename

axelrod/result_set.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
from typing import List
66
import warnings
77

8-
import numpy as np
9-
import tqdm
10-
118
import dask as da
129
import dask.dataframe as dd
10+
import numpy as np
11+
import tqdm
1312

1413
from axelrod.action import Action
1514
from . import eigen

axelrod/tests/integration/test_filtering.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import warnings
33

44
import axelrod as axl
5-
from axelrod import filtered_strategies, short_run_time_strategies
65
from axelrod.tests.property import strategy_lists
76

87
from hypothesis import example, given, settings

axelrod/tests/strategies/test_axelrod_second.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
"""Tests for the Second Axelrod strategies."""
22

3-
import random
4-
53
import axelrod as axl
6-
7-
import numpy as np
8-
94
from .test_player import TestPlayer
105

116
C, D = axl.Action.C, axl.Action.D
@@ -1155,9 +1150,8 @@ def test_strategy(self):
11551150
]
11561151
# Enter defect mode.
11571152
expected_actions += [(D, C)]
1158-
random.seed(10)
11591153
player = self.player()
1160-
match = axl.Match((player, axl.Random()), turns=len(expected_actions))
1154+
match = axl.Match((player, axl.Random()), turns=len(expected_actions), seed=10)
11611155
# The history matrix will be [[0, 2], [5, 6], [3, 6], [4, 2]]
11621156
actions = match.play()
11631157
self.assertEqual(actions, expected_actions)

axelrod/tests/strategies/test_cycler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Tests for the Cycler strategies."""
22
import unittest
33
import itertools
4-
import random
54

65
import axelrod as axl
76
from axelrod._strategy_utils import detect_cycle
@@ -12,6 +11,7 @@
1211
from .test_evolvable_player import PartialClass, TestEvolvablePlayer
1312

1413
C, D = Action.C, Action.D
14+
random = axl.RandomGenerator()
1515

1616

1717
class TestAntiCycler(TestPlayer):

axelrod/tests/strategies/test_evolvable_player.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import unittest
21
import functools
32
import unittest
43

axelrod/tests/strategies/test_finite_state_machines.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
"""Tests for Finite State Machine Strategies."""
2-
32
import unittest
43

5-
import random
6-
74
import axelrod as axl
85
from axelrod.compute_finite_state_machine_memory import get_memory_from_transitions
96
from axelrod.evolvable_player import InsufficientParametersError
@@ -13,7 +10,7 @@
1310
from .test_evolvable_player import PartialClass, TestEvolvablePlayer
1411

1512
C, D = axl.Action.C, axl.Action.D
16-
13+
random = axl.RandomGenerator()
1714

1815
class TestSimpleFSM(unittest.TestCase):
1916
def setUp(self):

0 commit comments

Comments
 (0)