Merge branch 'staging' into fix/zyzniewski/test_set_weights

Author: zyzniewski-reef

.github/workflows/e2e-subtensor-tests.yaml

@@ -80,6 +80,11 @@ jobs:
       - name: Check-out repository
         uses: actions/checkout@v4
 
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
       - name: Install uv
         uses: astral-sh/setup-uv@v4
 

tests/e2e_tests/conftest.py

@@ -164,7 +164,7 @@ def try_start_docker():
         print("Docker wasn't run. Manual start may be required.")
         return False
 
-    container_name = f"test_local_chain_{str(time.time()).replace(".", "_")}"
+    container_name = f"test_local_chain_{str(time.time()).replace('.', '_')}"
 
     # Command to start container
     cmds = [

tests/e2e_tests/test_incentive.py

@@ -84,8 +84,7 @@ async def test_incentive(local_chain, subtensor, templates, alice_wallet, bob_wa
     async with templates.miner(bob_wallet, netuid):
         async with templates.validator(alice_wallet, netuid) as validator:
             # wait for the Validator to process and set_weights
-            async with asyncio.timeout(60):
-                await validator.set_weights.wait()
+            await asyncio.wait_for(validator.set_weights.wait(), 60)
 
             # Wait till new epoch
             await wait_interval(tempo, subtensor, netuid)

tests/e2e_tests/utils/e2e_test_utils.py

@@ -116,8 +116,7 @@ async def __aenter__(self):
 
             self.__reader_task = asyncio.create_task(self._reader())
 
-            async with asyncio.timeout(30):
-                await self.started.wait()
+            await asyncio.wait_for(self.started.wait(), 30)
 
             return self
 
@@ -166,8 +165,7 @@ async def __aenter__(self):
 
             self.__reader_task = asyncio.create_task(self._reader())
 
-            async with asyncio.timeout(30):
-                await self.started.wait()
+            await asyncio.wait_for(self.started.wait(), 30)
 
             return self