Merge branch 'master' into release/2.32.0

antonpirker · antonpirker · commit 4b022dc731aa · 2025-06-27T08:37:07.000+02:00
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
@@ -173,6 +173,7 @@ deps =
     {py3.6,py3.7}-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
     gevent: pytest-asyncio
+    {py3.10,py3.11}-gevent: zope.event<5.0.0
 
     # === Integrations ===
 
diff --git a/tox.ini b/tox.ini
@@ -336,6 +336,7 @@ deps =
     {py3.6,py3.7}-gevent: pytest<7.0.0
     {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
     gevent: pytest-asyncio
+    {py3.10,py3.11}-gevent: zope.event<5.0.0
 
     # === Integrations ===
 
