Merge pull request #76 from Axelrod-Python/new_implementations

meatballs · web-flow · commit f1b099032e97 · 2018-03-15T09:28:21.000Z
New implementations
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.3
+current_version = 0.4.4
 commit = True
 tag = True
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v0.4.4 (2018-03-15)
+-------------------
+
+* Tag K66R as implemented by Mikkelson
+
 v0.4.3 (2018-02-07)
 -------------------
 
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-axelrod>=4.0.0
+axelrod>=4.1.0
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@ def read(*names, **kwargs):
 
 setup(
     name='axelrod-fortran',
-    version='0.4.3',
+    version='0.4.4',
     license='MIT license',
     description='Python wrapper for strategies originally written in Fortran',
     long_description='%s\n%s' % (
@@ -54,7 +54,7 @@ def read(*names, **kwargs):
         'Topic :: Utilities',
     ],
     install_requires=[
-        'axelrod >= 4.0.0',
+        'axelrod >= 4.1.0',
     ],
     python_requires=">=3.5",
 )
diff --git a/src/axelrod_fortran/__init__.py b/src/axelrod_fortran/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.4.3"
+__version__ = "0.4.4"
 
 from .player import Player
 from .strategies import (all_strategies, characteristics,
diff --git a/src/axelrod_fortran/strategies.py b/src/axelrod_fortran/strategies.py
@@ -182,7 +182,7 @@
         'author': 'Mark F Batell',
         'original_rank': 47},
     'k66r': {
-        'axelrod-python_class': None,
+        'axelrod-python_class': axl.Mikkelson,
         'stochastic': False,
         'author': 'Ray Mikkelson',
         'original_rank': 20},

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = "0.4.3"`
	`1`	`+__version__ = "0.4.4"`
`2`	`2`
`3`	`3`	`from .player import Player`
`4`	`4`	`from .strategies import (all_strategies, characteristics,`