fix CI errors

Author: Archmonger

src/reactpy/core/hooks.py

@@ -266,7 +266,8 @@ async def effect(stop: asyncio.Event) -> None:
                 # Prevent task cancellation if the user enabled shielding
                 if not shield:
                     task.cancel()
-                await asyncio.shield(task)
+                with contextlib.suppress(asyncio.CancelledError):
+                    await task
 
             # Run the clean-up function when the effect is stopped,
             # if it hasn't been run already by a new effect

src/reactpy/executors/pyscript/utils.py

@@ -49,7 +49,10 @@ def minify_python(source: str) -> str:
 
 
 def pyscript_executor_html(
-    file_paths: Sequence[str], uuid: str, root: str, cache_handler: Callable
+    file_paths: Sequence[str],
+    uuid: str,
+    root: str,
+    cache_handler: Callable | None = None,
 ) -> str:
     """Inserts the user's code into the PyScript template using pattern matching."""
     # Create a valid PyScript executor by replacing the template values

src/reactpy/testing/__init__.py

@@ -1,5 +1,10 @@
 from reactpy.testing.backend import BackendFixture
-from reactpy.testing.common import GITHUB_ACTIONS, HookCatcher, StaticEventHandler, poll
+from reactpy.testing.common import (
+    DEFAULT_TYPE_DELAY,
+    HookCatcher,
+    StaticEventHandler,
+    poll,
+)
 from reactpy.testing.display import DisplayFixture
 from reactpy.testing.logs import (
     LogAssertionError,
@@ -9,7 +14,7 @@
 )
 
 __all__ = [
-    "GITHUB_ACTIONS",
+    "DEFAULT_TYPE_DELAY",
     "BackendFixture",
     "DisplayFixture",
     "HookCatcher",

src/reactpy/testing/common.py

@@ -12,12 +12,14 @@
 from reactpy.config import REACTPY_TESTS_DEFAULT_TIMEOUT
 from reactpy.core._life_cycle_hook import HOOK_STACK, LifeCycleHook
 from reactpy.core.events import EventHandler, to_event_handler_function
+from reactpy.utils import GITHUB_ACTIONS
 
 _P = ParamSpec("_P")
 _R = TypeVar("_R")
 
 
 _DEFAULT_POLL_DELAY = 0.1
+DEFAULT_TYPE_DELAY = 250 if GITHUB_ACTIONS else 25
 
 
 class poll(Generic[_R]):  # noqa: N801

tests/test_client.py

@@ -2,8 +2,7 @@
 from pathlib import Path
 
 import reactpy
-from reactpy.testing import BackendFixture, DisplayFixture, poll
-from tests.tooling.common import DEFAULT_TYPE_DELAY
+from reactpy.testing import DEFAULT_TYPE_DELAY, BackendFixture, DisplayFixture, poll
 from tests.tooling.hooks import use_counter
 
 JS_DIR = Path(__file__).parent / "js"

tests/test_core/test_events.py

@@ -12,9 +12,8 @@
     to_event_handler_function,
 )
 from reactpy.core.layout import Layout
-from reactpy.testing import DisplayFixture, poll
+from reactpy.testing import DEFAULT_TYPE_DELAY, DisplayFixture, poll
 from reactpy.types import Event
-from tests.tooling.common import DEFAULT_TYPE_DELAY
 
 
 def test_event_handler_repr():

tests/test_core/test_hooks.py

@@ -8,10 +8,16 @@
 from reactpy.core._life_cycle_hook import LifeCycleHook
 from reactpy.core.hooks import strictly_equal, use_effect
 from reactpy.core.layout import Layout
-from reactpy.testing import DisplayFixture, HookCatcher, assert_reactpy_did_log, poll
+from reactpy.testing import (
+    DEFAULT_TYPE_DELAY,
+    DisplayFixture,
+    HookCatcher,
+    assert_reactpy_did_log,
+    poll,
+)
 from reactpy.testing.logs import assert_reactpy_did_not_log
 from reactpy.utils import Ref
-from tests.tooling.common import DEFAULT_TYPE_DELAY, update_message
+from tests.tooling.common import update_message
 
 
 async def test_must_be_rendering_in_layout_to_use_hooks():
@@ -600,6 +606,46 @@ async def effect():
     event_that_never_occurs.set()
 
 
+async def test_use_async_effect_shield():
+    component_hook = HookCatcher()
+    effect_ran = asyncio.Event()
+    effect_finished = asyncio.Event()
+    stop_waiting = asyncio.Event()
+
+    @reactpy.component
+    @component_hook.capture
+    def ComponentWithShieldedEffect():
+        @reactpy.hooks.use_async_effect(dependencies=None, shield=True)
+        async def effect():
+            effect_ran.set()
+            await stop_waiting.wait()
+            effect_finished.set()
+
+        return reactpy.html.div()
+
+    async with Layout(ComponentWithShieldedEffect()) as layout:
+        await layout.render()
+
+        await effect_ran.wait()
+
+        # Trigger re-render which would normally cancel the effect
+        component_hook.latest.schedule_render()
+
+        # Give the loop a chance to process the render logic and potentially cancel
+        await asyncio.sleep(0.1)
+
+        # Verify effect hasn't finished yet but also wasn't cancelled
+        assert not effect_finished.is_set()
+
+        # Now allow the effect to finish
+        stop_waiting.set()
+
+        # The re-render should complete now that the shielded effect is done
+        await layout.render()
+
+    await asyncio.wait_for(effect_finished.wait(), 1)
+
+
 async def test_async_effect_sleep_is_cancelled_on_re_render():
     """Test that async effects waiting on asyncio.sleep are properly cancelled."""
     component_hook = HookCatcher()

tests/test_html.py

@@ -2,9 +2,8 @@
 from playwright.async_api import expect
 
 from reactpy import component, config, hooks, html
-from reactpy.testing import DisplayFixture, poll
+from reactpy.testing import DEFAULT_TYPE_DELAY, DisplayFixture, poll
 from reactpy.utils import Ref
-from tests.tooling.common import DEFAULT_TYPE_DELAY
 from tests.tooling.hooks import use_counter
 
 

tests/test_widgets.py

@@ -2,8 +2,7 @@
 from pathlib import Path
 
 import reactpy
-from reactpy.testing import DisplayFixture, poll
-from tests.tooling.common import DEFAULT_TYPE_DELAY
+from reactpy.testing import DEFAULT_TYPE_DELAY, DisplayFixture, poll
 
 HERE = Path(__file__).parent
 

tests/tooling/common.py

@@ -1,10 +1,7 @@
 from typing import Any
 
-from reactpy.testing.common import GITHUB_ACTIONS
 from reactpy.types import LayoutEventMessage, LayoutUpdateMessage
 
-DEFAULT_TYPE_DELAY = 250 if GITHUB_ACTIONS else 50
-
 
 def event_message(target: str, *data: Any) -> LayoutEventMessage:
     return {"type": "layout-event", "target": target, "data": data}