Merge origin/main into copilot/update-usage-of-uvloop

Co-authored-by: toby-coleman <13170610+toby-coleman@users.noreply.github.com>

Author: Copilot

.github/workflows/benchmarks.yaml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     strategy:
       matrix:
-        python_version: [3.12]
+        python_version: [3.14]
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -80,4 +80,3 @@ jobs:
               repo: context.repo.repo,
               body: require('fs').readFileSync('${{ env.PR_COMMENT }}').toString()
             });
-

.github/workflows/docker.yaml

@@ -13,7 +13,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  PYTHON_VERSION: '3.12'
+  PYTHON_VERSION: '3.14'
 
 # See https://docs.github.com/en/actions/use-cases-and-examples/publishing-packages/publishing-docker-images
 jobs:

.github/workflows/docs.yaml

@@ -10,7 +10,7 @@ on:
       - completed
 
 env:
-  PYTHON_VERSION: '3.12'
+  PYTHON_VERSION: '3.14'
   GOOGLE_ANALYTICS_KEY: ${{ vars.GOOGLE_ANALYTICS_KEY }}
 
 jobs:

.github/workflows/lint-test.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
+        python_version: [3.12, 3.13, 3.14]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -78,7 +78,7 @@ jobs:
     timeout-minutes: 8
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
+        python_version: [3.12, 3.13, 3.14]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -116,7 +116,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
+        python_version: [3.12, 3.13, 3.14]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -161,7 +161,7 @@ jobs:
     timeout-minutes: 8
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
+        python_version: [3.12, 3.13, 3.14]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -201,7 +201,7 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
+        python_version: [3.12, 3.13, 3.14]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -231,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
+        python_version: [3.12, 3.13, 3.14]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -277,7 +277,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [3.12, 3.13]
+        python_version: [3.12, 3.13, 3.14]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/pypi.yaml

@@ -7,7 +7,7 @@ on:
       - completed
 
 env:
-  PYTHON_VERSION: '3.12'
+  PYTHON_VERSION: '3.14'
 
 permissions:
   contents: read

plugboard-schemas/pyproject.toml

@@ -19,7 +19,8 @@ classifiers = [
 ]
 dependencies = [
     "msgspec[yaml]>=0.18,<1",
-    "pydantic>=2.8,<3",
+    "pydantic>=2.8.0,<3 ; python_version < '3.14'",
+    "pydantic>=2.13.1,<3 ; python_version >= '3.14'",
 ]
 
 [build-system]

pyproject.toml

@@ -15,6 +15,7 @@ classifiers = [
   "Topic :: Scientific/Engineering",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Typing :: Typed",
 ]
 dependencies = [
@@ -24,11 +25,12 @@ dependencies = [
     "asyncpg>=0.29.0,<1",
     "fsspec>=2024.9.0",
     "httpx>=0.27,<1",
-    "msgspec[yaml]>=0.18,<1",
+    "msgspec[yaml]>=0.20,<1",
     "pandas>=1.0,<4",
     "plugboard-schemas",
     "pyarrow>=17.0,<24",
-    "pydantic>=2.8,<3",
+    "pydantic>=2.8.0,<3 ; python_version < '3.14'",
+    "pydantic>=2.13.1,<3 ; python_version >= '3.14'",
     "pydantic-settings>=2.7.1,<3",
     "pyzmq>=26.2,<28",
     "rich>=13.9,<15",
@@ -49,7 +51,7 @@ llm = [
 ]
 # Pinning jsonschema due to performance issues with Lark and rfc3987-syntax parser
 # https://github.com/python-jsonschema/jsonschema/issues/1392
-ray = ["ray[default,tune]>=2.47.1,<3", "jsonschema<4.25.0", "optuna>=3.0,<5"]
+ray = ["ray[tune]>=2.47.1,<3", "jsonschema<4.25.0", "optuna>=3.0,<5"]
 redis = ["redis>=7.1,<8"]
 websockets = ["websockets>=14.2,<17"]
 

tests/conftest.py

@@ -10,7 +10,6 @@
 import pytest
 import pytest_asyncio
 import pytest_cases
-import ray
 from that_depends import ContextScopes, container_context
 import uvloop
 
@@ -62,7 +61,9 @@ def ray_ctx() -> _t.Iterator[None]:
 
     Includes a small amount of resources to allow testing of resource-constrained components.
     """
-    ray.init(num_cpus=5, num_gpus=1, resources={"custom_hardware": 10}, include_dashboard=True)
+    import ray
+
+    ray.init(num_cpus=5, num_gpus=1, resources={"custom_hardware": 10}, include_dashboard=False)
     yield
     ray.shutdown()
 

tests/integration/test_component_resources.py

@@ -4,7 +4,7 @@
 import typing as _t
 
 import pytest
-from ray.util.state import list_actors
+import ray
 
 from plugboard.component import Component, IOController as IO
 from plugboard.connector import RayConnector
@@ -91,16 +91,23 @@ async def test_component_resources_in_ray_process(ray_ctx: None) -> None:
         initial_values={"a": [5]},
     )
     connectors = [RayConnector(spec=ConnectorSpec(source="test.b", target="test.a"))]
+    available_resources_before = ray.available_resources()
 
     process = RayProcess(components=[component], connectors=connectors)
 
     async with process:
-        actors = list_actors(detail=True)
-        component_actor = next(a for a in actors if a.name == "test")
-        # Verify the component actor has the correct resources
-        assert component_actor.required_resources is not None
-        assert component_actor.required_resources["CPU"] == 1.0
-        assert component_actor.required_resources["memory"] == 1.0 * 1024 * 1024
+        component_actor = ray.get_actor("test", namespace=process._namespace)
+        assert component_actor is not None
+        # Verify the component actor has reserved the correct resources.
+        available_resources = ray.available_resources()
+        cpu_reserved = available_resources_before.get("CPU", 0.0) - available_resources.get(
+            "CPU", 0.0
+        )
+        memory_reserved = available_resources_before.get("memory", 0.0) - available_resources.get(
+            "memory", 0.0
+        )
+        assert cpu_reserved == pytest.approx(1.0)
+        assert memory_reserved == pytest.approx(1.0 * 1024 * 1024)
         await process.run()
 
     assert component.b == 10