From 9b060182b2b6f5481671727fe88c4c0d313086d1 Mon Sep 17 00:00:00 2001 From: Caddy Date: Tue, 4 Aug 2020 14:30:25 +0100 Subject: [PATCH 1/3] Add a long-run strategy to the filtering test Currently `test_boolean_filtering` only uses strategies as given by the `strategy_list` hypothesis strategy. This by default only picks short run time strategies so we are not ensuring that the long run filter works. --- axelrod/tests/integration/test_filtering.py | 1 + 1 file changed, 1 insertion(+) diff --git a/axelrod/tests/integration/test_filtering.py b/axelrod/tests/integration/test_filtering.py index cddffd3da..86a79a7f4 100644 --- a/axelrod/tests/integration/test_filtering.py +++ b/axelrod/tests/integration/test_filtering.py @@ -21,6 +21,7 @@ def tearDown(self) -> None: warnings.simplefilter("default", category=UserWarning) @given(strategies=strategy_lists(min_size=20, max_size=20)) + @example(strategies=[axl.DBS, axl.Cooperator]) def test_boolean_filtering(self, strategies): classifiers = [ From 1e86052856176604d19f65706a78a8c0e6018e37 Mon Sep 17 00:00:00 2001 From: Caddy Date: Tue, 4 Aug 2020 18:27:01 +0100 Subject: [PATCH 2/3] Changed float to int in rst file Last PR failed checks, probably due to an int vs float issue in the dependencies. --- docs/tutorials/advanced/tournament_results.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/advanced/tournament_results.rst b/docs/tutorials/advanced/tournament_results.rst index f2778ebfa..72ca2e4a8 100644 --- a/docs/tutorials/advanced/tournament_results.rst +++ b/docs/tutorials/advanced/tournament_results.rst @@ -343,7 +343,7 @@ This gives the count of cooperations made by each player during the first turn of every match:: >>> results.initial_cooperation_count - [9.0, 0.0, 9.0, 9.0] + [9, 0, 9, 9] Each player plays an opponent a total of 9 times (3 opponents and 3 repetitions). Apart from the :code:`Defector`, they all cooperate on the first From c7777df850746fb3b2deab7d290267aeebbb8349 Mon Sep 17 00:00:00 2001 From: Caddy Date: Thu, 6 Aug 2020 03:12:20 +0100 Subject: [PATCH 3/3] Modify config.yml Specified isort version dependency to facilitate checks during commit. --- .github/workflows/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 4599f2d8f..636ade0fe 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -51,8 +51,8 @@ jobs: python run_mypy.py - name: Check imports are sorted run: | - python -m pip install isort - python -m isort --check-only + python -m pip install "isort==4.3.21" + python -m isort --check-only --recursive axelrod/. - name: Check that all strategies are indexed run: | python run_strategy_indexer.py