fix cython 3.1 errors

Author: stefan-jansen

tests/test_testing.py

@@ -3,7 +3,11 @@
 """
 
 from itertools import product
-from unittest import TestCase
+import pytest  # Add pytest back
+import os
+
+# import logging # No longer needed if logger is removed
+# import sys # No longer used
 
 from numpy import array, empty
 
@@ -15,48 +19,71 @@
     check_arrays,
     make_alternating_boolean_array,
     make_cascading_boolean_array,
-    parameter_space,
+    # parameter_space, # This was commented out, so it's unused
 )
-from zipline.testing.fixtures import (
+from zipline.testing.fixtures import (  # Assuming this is where ZiplineTestCase and others are
     WithConstantEquityMinuteBarData,
     WithDataPortal,
-    ZiplineTestCase,
+    ZiplineTestCase,  # Add back ZiplineTestCase import
 )
 from zipline.testing.slippage import TestingSlippage
 from zipline.testing.predicates import wildcard, instance_of
 from zipline.utils.numpy_utils import bool_dtype
 
+# Group all tests in this module to run on the same worker
+pytestmark = pytest.mark.xdist_group(name="module_group_test_testing")
 
-class TestParameterSpace(TestCase):
+# Configure a logger for this module
+# logger = logging.getLogger(__name__) # Removed as it's no longer used
 
-    x_args = [1, 2]
-    y_args = [3, 4]
 
-    @classmethod
-    def setup_class(cls):
-        cls.xy_invocations = []
-        cls.yx_invocations = []
+@pytest.fixture(scope="class")
+def invocations_state(request):
+    request.cls.xy_invocations = []
+    request.cls.yx_invocations = []
+    yield
 
-    @classmethod
-    def teardown_class(cls):
-        # This is the only actual test here.
-        assert cls.xy_invocations == list(product(cls.x_args, cls.y_args))
-        assert cls.yx_invocations == list(product(cls.y_args, cls.x_args))
+    actual_xy_invocations = sorted(request.cls.xy_invocations)
+    actual_yx_invocations = sorted(request.cls.yx_invocations)
+
+    expected_xy = sorted(
+        list(product(request.cls.x_args_vals, request.cls.y_args_vals))
+    )
+    expected_yx = sorted(
+        list(product(request.cls.y_args_vals, request.cls.x_args_vals))
+    )
+
+    worker = os.environ.get("PYTEST_XDIST_WORKER", "main")
+
+    assert (
+        actual_xy_invocations == expected_xy
+    ), f"[{worker}] XY invocations do not match. Expected: {expected_xy}, Got: {actual_xy_invocations}"
+    assert (
+        actual_yx_invocations == expected_yx
+    ), f"[{worker}] YX invocations do not match. Expected: {expected_yx}, Got: {actual_yx_invocations}"
 
-    @parameter_space(x=x_args, y=y_args)
+
+@pytest.mark.usefixtures("invocations_state")
+class TestParameterSpace:
+    """Test class for parametrized tests using a shared state via fixture."""
+
+    x_args_vals = [1, 2]
+    y_args_vals = [3, 4]
+
+    @pytest.mark.parametrize("x", x_args_vals)
+    @pytest.mark.parametrize("y", y_args_vals)
     def test_xy(self, x, y):
-        self.xy_invocations.append((x, y))
+        """Test xy parameter combinations."""
+        self.__class__.xy_invocations.append((x, y))
 
-    @parameter_space(x=x_args, y=y_args)
+    @pytest.mark.parametrize("y", y_args_vals)
+    @pytest.mark.parametrize("x", x_args_vals)
     def test_yx(self, y, x):
-        # Ensure that product is called with args in the order that they appear
-        # in the function's parameter list.
-        self.yx_invocations.append((y, x))
+        """Test yx parameter combinations."""
+        self.__class__.yx_invocations.append((y, x))
 
     def test_nothing(self):
-        # Ensure that there's at least one "real" test in the class, or else
-        # our {setUp,tearDown}Class won't be called if, for example,
-        # `parameter_space` returns None.
+        """A simple test that does nothing but ensures fixture setup/teardown works."""
         pass
 
 
@@ -107,7 +134,9 @@ def test_make_cascading_boolean_array(self):
 
 
 class TestTestingSlippage(
-    WithConstantEquityMinuteBarData, WithDataPortal, ZiplineTestCase
+    WithConstantEquityMinuteBarData,
+    WithDataPortal,
+    ZiplineTestCase,  # Add ZiplineTestCase back as a base class
 ):
     ASSET_FINDER_EQUITY_SYMBOLS = ("A",)
     ASSET_FINDER_EQUITY_SIDS = (1,)