Merge branch 'master' of https://github.com/caddycarine/Axelrod

Author: czemtsop

.github/workflows/config.yml

@@ -49,6 +49,10 @@ jobs:
       run: |
         python -m pip install mypy
         python run_mypy.py
+    - name: Check imports are sorted
+      run: |
+        python -m pip install isort
+        python -m isort --check-only
     - name: Check that all strategies are indexed
       run: |
         python run_strategy_indexer.py

.isort.cfg

@@ -0,0 +1,7 @@
+[settings]
+default_section = THIRDPARTY
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+combine_as_imports = True
+line_length = 88

.prepare-commit-msg.py

@@ -21,8 +21,8 @@
 # Any issue numbers created by this hook (or entered manually in the correct)
 # format will now be clickable links in the log view.
 
-import sys
 import re
+import sys
 from subprocess import check_output
 
 # By default, the hook will check to see if the branch name starts with

axelrod/__init__.py

@@ -1,3 +1,4 @@
+# isort:skip_file
 DEFAULT_TURNS = 200
 
 # The order of imports matters!

axelrod/classifier.py

@@ -1,4 +1,5 @@
 import os
+import warnings
 from typing import (
     Any,
     Callable,
@@ -11,9 +12,8 @@
     TypeVar,
     Union,
 )
-import warnings
-import yaml
 
+import yaml
 from axelrod.player import Player
 
 ALL_CLASSIFIERS_PATH = "data/all_classifiers.yml"

axelrod/compute_finite_state_machine_memory.py

@@ -1,6 +1,7 @@
-from axelrod.action import Action
 from collections import defaultdict, namedtuple
-from typing import DefaultDict, Iterator, Dict, Tuple, Set, List
+from typing import DefaultDict, Dict, Iterator, List, Set, Tuple
+
+from axelrod.action import Action
 
 C, D = Action.C, Action.D
 
@@ -263,4 +264,3 @@ def get_memory_from_transitions(
     if len(next_action_set) == 1:
         return 0
     return 1
-

axelrod/deterministic_cache.py

@@ -17,6 +17,7 @@
 from typing import List, Tuple
 
 from axelrod import Classifiers
+
 from .action import Action
 from .player import Player
 

axelrod/evolvable_player.py

@@ -2,6 +2,7 @@
 from pickle import dumps, loads
 from random import randrange
 from typing import Dict, List
+
 from .player import Player
 
 

axelrod/fingerprint.py

@@ -3,19 +3,18 @@
 from tempfile import mkstemp
 from typing import Any, List, Union
 
+import axelrod as axl
 import dask.dataframe as dd
 import matplotlib.pyplot as plt
 import numpy as np
 import tqdm
-from mpl_toolkits.axes_grid1 import make_axes_locatable
-
-import axelrod as axl
 from axelrod import Player
 from axelrod.interaction_utils import (
     compute_final_score_per_turn,
     read_interactions_from_file,
 )
 from axelrod.strategy_transformers import DualTransformer, JossAnnTransformer
+from mpl_toolkits.axes_grid1 import make_axes_locatable
 
 Point = namedtuple("Point", "x y")
 

axelrod/match.py

@@ -2,10 +2,10 @@
 from math import ceil, log
 
 import axelrod.interaction_utils as iu
-from axelrod import DEFAULT_TURNS
+from axelrod import DEFAULT_TURNS, Classifiers
 from axelrod.action import Action
-from axelrod import Classifiers
 from axelrod.game import Game
+
 from .deterministic_cache import DeterministicCache
 
 C, D = Action.C, Action.D