Merge branch 'develop' into dependabot/pip/twisted-24.10.0

.github/workflows/tests.yml

@@ -583,8 +583,8 @@ jobs:
           - python-version: "3.9"
             postgres-version: "11"
 
-          - python-version: "3.11"
+          - python-version: "3.13"
-            postgres-version: "15"
+            postgres-version: "17"
 
     services:
       postgres:

changelog.d/17909.misc

@@ -0,0 +1 @@
+Update the portdb CI to use Python 3.13 and Postgres 17 as latest dependencies.

changelog.d/17911.bugfix

@@ -0,0 +1 @@
+Fix tests to run with latest Twisted.

tests/util/test_async_helpers.py

@@ -320,12 +320,19 @@ class ConcurrentlyExecuteTest(TestCase):
                 await concurrently_execute(callback, [1], 2)
             except _TestException as e:
                 tb = traceback.extract_tb(e.__traceback__)
-                # we expect to see "caller", "concurrently_execute", "callback",
+
-                # and some magic from inside ensureDeferred that happens when .fail
+                # Remove twisted internals from the stack, as we don't care
-                # is called.
+                # about the precise details.
+                tb = traceback.StackSummary(
+                    t for t in tb if "/twisted/" not in t.filename
+                )
+
+                # we expect to see "caller", "concurrently_execute" at the top of the stack
                 self.assertEqual(tb[0].name, "caller")
                 self.assertEqual(tb[1].name, "concurrently_execute")
-                self.assertEqual(tb[-2].name, "callback")
+                # ... some stack frames from the implementation of `concurrently_execute` ...
+                # and at the bottom of the stack we expect to see "callback"
+                self.assertEqual(tb[-1].name, "callback")
             else:
                 self.fail("No exception thrown")