Temporary commit: Fix tests, update requirements, and tox configuration

Author: Mike014

CHANGES.md

@@ -4,18 +4,9 @@ Mainly internal changes: fix for `TestOpponent` class and updates to various fil
 
 - Fixed `TestOpponent` class in `axelrod/tests/strategies/test_player.py` to remove the `__init__` constructor and replaced it with a static `strategy` method to resolve PytestCollectionWarning.
   - The class now defines a `strategy` method that returns `C`, as required for it to be collectable by pytest.
-  
-  ```python
-  class OpponentTest(axl.Player):
-      """A player who only exists so we have something to test against"""
-  
-      name = "OpponentTest"
-      classifier = _test_classifier
-  
-      @staticmethod
-      def strategy(opponent):
-          return C
 
+- Renamed `TestMakesUseOfLengthAndGamePlayer` class to `MakesUseOfLengthAndGamePlayer` in axelrod/tests/unit/test_makes_use_of.py to resolve PytestCollectionWarning.
+- Renamed `TestMakesUseOfNothingPlayer` class to `MakesUseOfNothingPlayer` in axelrod/tests/unit/test_makes_use_of.py to resolve PytestCollectionWarning.
 - **Updated docs/Makefile**.
 - **Updated setup.py**.
 

MG_test/MG_test.py

@@ -349,6 +349,7 @@ def test_init_kwargs(self):
             TypeError, ParameterisedTestPlayer, "other", "other", "other"
         )
 
+
 # TestPlayer class for testing against a known opponent
 # class TestOpponent(axl.Player):
 #     """A player who only exists so we have something to test against"""
@@ -360,6 +361,7 @@ def test_init_kwargs(self):
 #     def strategy(opponent):
 #         return C
 
+
 class OpponentTest(axl.Player):
     """A player who only exists so we have something to test against"""
 
@@ -370,6 +372,7 @@ class OpponentTest(axl.Player):
     def strategy(opponent):
         return C
 
+
 class TestPlayer(unittest.TestCase):
     """A Test class from which other player test classes are inherited."""
 
@@ -642,7 +645,7 @@ def classifier_test(self, expected_class_classifier=None):
             "stochastic" in player.classifier,
             msg="stochastic not in classifier",
         )
-        # OpponentTest 
+        # OpponentTest
         for key in OpponentTest.classifier:
             self.assertEqual(
                 axl.Classifiers[key](player),

axelrod/tests/strategies/test_player.py

@@ -113,7 +113,7 @@ def test_invalid_matrices(self, A, B):
         self.assertEqual(error_raised, (A.shape != B.transpose().shape))
 
     @given(asymgame=asymmetric_games())
-    @settings(max_examples=5)
+    @settings(max_examples=5, deadline=3000)
     def test_random_repr(self, asymgame):
         """Test repr with random scores."""
         expected_repr = "Axelrod game with matrices: {}".format(

axelrod/tests/unit/test_game.py

@@ -19,14 +19,16 @@
 
 
 class TestStrategyList(unittest.TestCase):
-    def test_call(self):
-        strategies = strategy_lists().example()
+    # MG: Replaced .example() with @given for generating strategies
+    @given(strategies=strategy_lists())
+    @settings(max_examples=3)
+    def test_call(self, strategies):
         self.assertIsInstance(strategies, list)
         for p in strategies:
             self.assertIsInstance(p(), axl.Player)
 
     @given(strategies=strategy_lists(min_size=1, max_size=50))
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator(self, strategies):
         self.assertIsInstance(strategies, list)
         self.assertGreaterEqual(len(strategies), 1)
@@ -35,7 +37,7 @@ def test_decorator(self, strategies):
             self.assertIsInstance(strategy(), axl.Player)
 
     @given(strategies=strategy_lists(strategies=axl.basic_strategies))
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator_with_given_strategies(self, strategies):
         self.assertIsInstance(strategies, list)
         basic_player_names = [str(s()) for s in axl.basic_strategies]
@@ -50,12 +52,14 @@ class TestMatch(unittest.TestCase):
     Test that the composite method works
     """
 
-    def test_call(self):
-        match = matches().example()
+    # MG: Replaced .example() with @given for match generation
+    @given(match=matches())
+    @settings(max_examples=3)
+    def test_call(self, match):
         self.assertIsInstance(match, axl.Match)
 
     @given(match=matches(min_turns=10, max_turns=50, min_noise=0, max_noise=1))
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator(self, match):
         self.assertIsInstance(match, axl.Match)
         self.assertGreaterEqual(len(match), 10)
@@ -64,7 +68,7 @@ def test_decorator(self, match):
         self.assertLessEqual(match.noise, 1)
 
     @given(match=matches(min_turns=10, max_turns=50, min_noise=0, max_noise=0))
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator_with_no_noise(self, match):
         self.assertIsInstance(match, axl.Match)
         self.assertGreaterEqual(len(match), 10)
@@ -73,8 +77,10 @@ def test_decorator_with_no_noise(self, match):
 
 
 class TestTournament(unittest.TestCase):
-    def test_call(self):
-        tournament = tournaments().example()
+    # MG: Replaced .example() with @given for tournament generation
+    @given(tournament=tournaments())
+    @settings(max_examples=3)
+    def test_call(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
 
     @given(
@@ -88,7 +94,7 @@ def test_call(self):
             max_size=3,
         )
     )
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         self.assertLessEqual(tournament.turns, 50)
@@ -99,7 +105,7 @@ def test_decorator(self, tournament):
         self.assertGreaterEqual(tournament.repetitions, 2)
 
     @given(tournament=tournaments(strategies=axl.basic_strategies, max_size=3))
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator_with_given_strategies(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         basic_player_names = [str(s()) for s in axl.basic_strategies]
@@ -108,8 +114,9 @@ def test_decorator_with_given_strategies(self, tournament):
 
 
 class TestProbEndTournament(unittest.TestCase):
-    def test_call(self):
-        tournament = tournaments().example()
+    @given(tournament=prob_end_tournaments())
+    @settings(max_examples=3)
+    def test_call(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
 
     @given(
@@ -123,7 +130,7 @@ def test_call(self):
             max_size=3,
         )
     )
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         self.assertLessEqual(tournament.prob_end, 1)
@@ -138,7 +145,7 @@ def test_decorator(self, tournament):
             strategies=axl.basic_strategies, max_size=3
         )
     )
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator_with_given_strategies(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         basic_player_names = [str(s()) for s in axl.basic_strategies]
@@ -147,8 +154,9 @@ def test_decorator_with_given_strategies(self, tournament):
 
 
 class TestSpatialTournament(unittest.TestCase):
-    def test_call(self):
-        tournament = spatial_tournaments().example()
+    @given(tournament=spatial_tournaments())
+    @settings(max_examples=3)
+    def test_call(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
 
     @given(
@@ -162,7 +170,7 @@ def test_call(self):
             max_size=3,
         )
     )
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         self.assertLessEqual(tournament.turns, 50)
@@ -177,7 +185,7 @@ def test_decorator(self, tournament):
             strategies=axl.basic_strategies, max_size=3
         )
     )
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator_with_given_strategies(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         basic_player_names = [str(s()) for s in axl.basic_strategies]
@@ -186,8 +194,9 @@ def test_decorator_with_given_strategies(self, tournament):
 
 
 class TestProbEndSpatialTournament(unittest.TestCase):
-    def test_call(self):
-        tournament = prob_end_spatial_tournaments().example()
+    @given(tournament=prob_end_spatial_tournaments())
+    @settings(max_examples=3)
+    def test_call(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
 
     @given(
@@ -201,7 +210,7 @@ def test_call(self):
             max_size=3,
         )
     )
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         self.assertLessEqual(tournament.prob_end, 1)
@@ -216,7 +225,7 @@ def test_decorator(self, tournament):
             strategies=axl.basic_strategies, max_size=3
         )
     )
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator_with_given_strategies(self, tournament):
         self.assertIsInstance(tournament, axl.Tournament)
         basic_player_names = [str(s()) for s in axl.basic_strategies]
@@ -225,18 +234,19 @@ def test_decorator_with_given_strategies(self, tournament):
 
 
 class TestGame(unittest.TestCase):
-    def test_call(self):
-        game = games().example()
+    @given(game=games())
+    @settings(max_examples=3)
+    def test_call(self, game):
         self.assertIsInstance(game, axl.Game)
 
     @given(game=games())
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator(self, game):
         self.assertIsInstance(game, axl.Game)
         r, p, s, t = game.RPST()
         self.assertTrue((2 * r) > (t + s) and (t > r > p > s))
 
     @given(game=games(prisoners_dilemma=False))
-    @settings(max_examples=5)
+    @settings(max_examples=3)
     def test_decorator_unconstrained(self, game):
         self.assertIsInstance(game, axl.Game)

axelrod/tests/unit/test_property.py

@@ -1,3 +1,45 @@
-docutils>=0.18.1
-numpy==1.24.3  # numpy isn't mocked due to complex use in doctests
-mock>=5.1.0
+attrs==24.3.0
+cachetools==5.5.0
+chardet==5.2.0
+click==8.1.8
+cloudpickle==3.1.0
+colorama==0.4.6
+contourpy==1.3.1
+cycler==0.12.1
+dask==2024.12.1
+dask-expr==1.1.21
+distlib==0.3.9
+docutils==0.21.2
+filelock==3.16.1
+fonttools==4.55.3
+fsspec==2024.12.0
+hypothesis==6.123.4
+importlib_metadata==8.5.0
+iniconfig==2.0.0
+kiwisolver==1.4.8
+locket==1.0.0
+matplotlib==3.10.0
+mock==5.1.0
+numpy==1.24.3
+packaging==24.2
+pandas==2.2.3
+partd==1.4.2
+pillow==11.1.0
+platformdirs==4.3.6
+pluggy==1.5.0
+pyarrow==18.1.0
+pyparsing==3.2.1
+pyproject-api==1.8.0
+pytest==8.3.4
+python-dateutil==2.9.0.post0
+pytz==2024.2
+PyYAML==6.0.2
+scipy==1.15.0
+six==1.17.0
+sortedcontainers==2.4.0
+toolz==1.0.0
+tox==4.23.2
+tqdm==4.67.1
+tzdata==2024.2
+virtualenv==20.28.1
+zipp==3.21.0

docs/requirements.txt

@@ -1,35 +1,48 @@
 [tox]
+# Enable isolated build to ensure compatibility
 isolated_build = True
 envlist = py311, py312
 
 [gh-actions]
+# Map GitHub Actions Python versions to tox environments
 python =
     3.11: py311
     3.12: py312
 
 [flake8]
+# Ignore specific rules for certain files
 per-file-ignores =
-    setup.py: F821
-    docs/_build/*: ALL
-    docs/conf.py: E402
-    **/__init__.py: F401 F403
+    setup.py: F821  # Ignore undefined names in setup.py
+    docs/_build/*: ALL  # Ignore all issues in built documentation
+    docs/conf.py: E402  # Allow imports not at the top of the file
+    **/__init__.py: F401 F403  # Ignore unused imports and wildcard imports in __init__.py
+# Global ignores for flake8
 ignore =
-    E203
-    E501
-    W291
-    W503
+    E203  # Whitespace before ':'
+    E501  # Line length > 80
+    W291  # Trailing whitespace
+    W503  # Line break before binary operator
 
 [testenv]
 deps =
     hypothesis
     pytest-cov
     pytest-randomly
     pytest-sugar
+    pytest-xdist  # Added for parallelizing tests
     isort
     black
     numpy==1.26.4
 commands =
-    python -m pytest --cov-report term-missing --cov=axelrod --cov-fail-under=100 . --doctest-glob="*.md" --doctest-glob="*.rst"
+    # Run tests in parallel using all available CPU cores
+    python -m pytest -n auto --cov-report term-missing --cov=axelrod --cov-fail-under=100 . --doctest-glob="*.md" --doctest-glob="*.rst"
+
+    # Check code formatting with Black (no changes are made)
     python -m black -l 80 . --check
+
+    # Verify import sorting with isort
     python -m isort --check-only axelrod/.
+
+    # Run the strategy indexer script
     python run_strategy_indexer.py
+