bump: python cloudevents sdk major version 2 + related bumps

e2e/e2e_matrix_test.go

@@ -70,10 +70,11 @@ func TestMatrix_Run(t *testing.T) {
 			t.Fatal("service does not appear to have started correctly.")
 		}
 
-		// ^C the running function
+		// ^C the running function and wait for it to exit so the port is released
 		if err := cmd.Process.Signal(os.Interrupt); err != nil {
 			fmt.Fprintf(os.Stderr, "error interrupting. %v", err)
 		}
+		_ = cmd.Wait()
 
 	})
 }

e2e/testdata/templates-userdeps/python/http/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "function"
 version = "0.1.0"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "MIT"
 
 [build-system]

e2e/testdata/templates/python/http/pyproject.toml

@@ -2,7 +2,7 @@
 name = "function"
 description = ""
 version = "0.1.0"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = "MIT"
 dependencies = [

pkg/buildpacks/scaffolder.go

@@ -87,7 +87,7 @@ func patchPyprojectForPack(pyprojectPath string) error {
 		return fmt.Errorf("cannot read pyproject.toml for patching: %w", err)
 	}
 	content := strings.Replace(string(data), "{root:uri}/f", "./f", 1)
-	content += "[tool.poetry.dependencies]\npython = \">=3.9,<4.0\"\nfunction = { path = \"f\", develop = true }\n"
+	content += "[tool.poetry.dependencies]\npython = \">=3.10,<4.0\"\nfunction = { path = \"f\", develop = true }\n"
 	if err = os.WriteFile(pyprojectPath, []byte(content), 0644); err != nil {
 		return fmt.Errorf("cannot write patched pyproject.toml: %w", err)
 	}

pkg/s2i/assemblers.go

@@ -12,7 +12,7 @@ Assemble Scripts Patched for Functions Support
 These are minimally patched assemblers taken from the S2I builders.   For
 example the Python assemble script can be extracted with:
 
-docker run --rm registry.access.redhat.com/ubi8/python-39 \
+docker run --rm registry.access.redhat.com/ubi8/python-311 \
   cat /usr/libexec/s2i/assemble > bin/assemble
 
 The scripts are modified slightly to support Functions as explained by

pkg/s2i/builder.go

@@ -29,7 +29,7 @@ const DefaultName = builders.S2I
 
 var DefaultNodeBuilder = "registry.access.redhat.com/ubi8/nodejs-20-minimal"
 var DefaultQuarkusBuilder = "registry.access.redhat.com/ubi8/openjdk-21"
-var DefaultPythonBuilder = "registry.access.redhat.com/ubi8/python-39"
+var DefaultPythonBuilder = "registry.access.redhat.com/ubi8/python-311"
 var DefaultGoBuilder = "registry.access.redhat.com/ubi8/go-toolset"
 
 // DefaultBuilderImages for s2i builders indexed by Runtime Language

templates/python/cloudevents/function/func.py

@@ -1,6 +1,6 @@
 # Function
 import logging
-from cloudevents.http import CloudEvent
+from cloudevents.core.v1.event import CloudEvent
 
 
 def new():
@@ -33,16 +33,16 @@ async def handle(self, scope, receive, send):
         request = scope["event"]
 
         # 2) Create a new CloudEvent as response with "OK" as data
-        response = CloudEvent({
-            "type": "function.response",
-            "source": "function",
-            "id": f"response-{request.get('id', 'unknown')}"
-        })
+        response = CloudEvent(
+            attributes={
+                "type": "function.response",
+                "source": "function",
+                "id": f"response-{request.get_id() or 'unknown'}"
+            },
+            data={"message": "OK"}
+        )
 
-        # 3) Set the response's data field to {"message": "OK"}
-        response.data = {"message": "OK"}
-
-        # 4) Send the response CloudEvent
+        # 3) Send the response CloudEvent
         # The 'send' method is already decorated with CloudEvent middleware
         await send(response)
 

templates/python/cloudevents/pyproject.toml

@@ -2,12 +2,12 @@
 name = "function"
 description = ""
 version = "0.1.0"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = "MIT"
 dependencies = [
   "httpx",
-  "cloudevents>=1.11,<2",
+  "cloudevents>=2,<3",
   "pytest",
   "pytest-asyncio"
 ]

templates/python/cloudevents/tests/test_func.py

@@ -10,7 +10,7 @@
 import json
 import asyncio
 import pytest
-from cloudevents.http import CloudEvent
+from cloudevents.core.v1.event import CloudEvent
 from function import new
 
 
@@ -25,7 +25,7 @@ async def test_func():
         "source": "https://example.com/event-producer",
     }
     data = {"message": "test message"}
-    event = CloudEvent(attributes, data)
+    event = CloudEvent(attributes=attributes, data=data)
 
     invoked = False  # Flag indicating send method was invoked
 
@@ -40,7 +40,7 @@ async def send(e):
 
         # Ensure it returns {"message": "OK"} as data
         expected = {"message": "OK"}
-        assert e.data == expected, f"Expected data {expected}, got {e.data}"
+        assert e.get_data() == expected, f"Expected data {expected}, got {e.get_data()}"
 
     # Invoke the Function
     scope = {"event": event}  # Add the CloudEvent to the scope

templates/python/http/pyproject.toml

@@ -2,7 +2,7 @@
 name = "function"
 description = ""
 version = "0.1.0"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = "MIT"
 dependencies = [

templates/python/scaffolding/instanced-cloudevents/pyproject.toml

@@ -2,11 +2,11 @@
 name = "service"
 description = "an autogenerated service which runs a Function"
 version = "0.1.0"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = "MIT"
 dependencies = [
-    "func-python==0.7.0",
+    "func-python==0.8.0",
     "function @ {root:uri}/f"
 ]
 authors = [

templates/python/scaffolding/instanced-http/pyproject.toml

@@ -2,11 +2,11 @@
 name = "service"
 description = "an autogenerated service which runs a Function"
 version = "0.1.0"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = "MIT"
 dependencies = [
-    "func-python==0.7.0",
+    "func-python==0.8.0",
     "function @ {root:uri}/f"
 ]
 authors = [