From e8e0f52e117b05c12f0e68432607bb1046180082 Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Tue, 22 Apr 2025 16:02:19 +0200
Subject: [PATCH 1/8] tests: Migrate aiohttp under toxgen

---
 scripts/populate_tox/config.py       | 14 ++++++++++
 scripts/populate_tox/populate_tox.py |  1 -
 scripts/populate_tox/tox.jinja       | 13 ----------
 tox.ini                              | 39 ++++++++++++++--------------
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
index f3f1ba0092..a730795200 100644
--- a/scripts/populate_tox/config.py
+++ b/scripts/populate_tox/config.py
@@ -6,6 +6,20 @@
 # See scripts/populate_tox/README.md for more info on the format and examples.
 
 TEST_SUITE_CONFIG = {
+    #
+    # AIOHTTP
+    # aiohttp-v3.4: aiohttp~=3.4.0
+    # aiohttp-v3.8: aiohttp~=3.8.0
+    # aiohttp-latest: aiohttp
+    # aiohttp: pytest-aiohttp
+    # aiohttp-v3.8: pytest-asyncio
+    # aiohttp-latest: pytest-asyncio
+    "aiohttp": {
+        "package": "aiohttp",
+        "deps": {
+            "*": ["pytest-aiohttp", "pytest-asyncio"],
+        },
+    },
     "ariadne": {
         "package": "ariadne",
         "deps": {
diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py
index 11ea94c0f4..414cb09cdd 100644
--- a/scripts/populate_tox/populate_tox.py
+++ b/scripts/populate_tox/populate_tox.py
@@ -67,7 +67,6 @@
     "potel",
     # Integrations that can be migrated -- we should eventually remove all
     # of these from the IGNORE list
-    "aiohttp",
     "anthropic",
     "arq",
     "asyncpg",
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
index 380a80f690..3cfb5e1252 100644
--- a/scripts/populate_tox/tox.jinja
+++ b/scripts/populate_tox/tox.jinja
@@ -36,11 +36,6 @@ envlist =
     # At a minimum, we should test against at least the lowest
     # and the latest supported version of a framework.
 
-    # AIOHTTP
-    {py3.7}-aiohttp-v{3.4}
-    {py3.7,py3.9,py3.11}-aiohttp-v{3.8}
-    {py3.8,py3.12,py3.13}-aiohttp-latest
-
     # Anthropic
     {py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40}
     {py3.7,py3.11,py3.12}-anthropic-latest
@@ -184,14 +179,6 @@ deps =
 
     # === Integrations ===
 
-    # AIOHTTP
-    aiohttp-v3.4: aiohttp~=3.4.0
-    aiohttp-v3.8: aiohttp~=3.8.0
-    aiohttp-latest: aiohttp
-    aiohttp: pytest-aiohttp
-    aiohttp-v3.8: pytest-asyncio
-    aiohttp-latest: pytest-asyncio
-
     # Anthropic
     anthropic: pytest-asyncio
     anthropic-v{0.16,0.28}: httpx<0.28.0
diff --git a/tox.ini b/tox.ini
index 9497708ff8..8a127b35dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-04-17T11:01:25.976599+00:00
+# Last generated: 2025-04-22T14:02:00.594337+00:00
 
 [tox]
 requires =
@@ -36,11 +36,6 @@ envlist =
     # At a minimum, we should test against at least the lowest
     # and the latest supported version of a framework.
 
-    # AIOHTTP
-    {py3.7}-aiohttp-v{3.4}
-    {py3.7,py3.9,py3.11}-aiohttp-v{3.8}
-    {py3.8,py3.12,py3.13}-aiohttp-latest
-
     # Anthropic
     {py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40}
     {py3.7,py3.11,py3.12}-anthropic-latest
@@ -195,7 +190,7 @@ envlist =
     {py3.8,py3.10,py3.11}-ariadne-v0.20.1
     {py3.8,py3.11,py3.12}-ariadne-v0.22
     {py3.8,py3.11,py3.12}-ariadne-v0.24.0
-    {py3.9,py3.12,py3.13}-ariadne-v0.26.1
+    {py3.9,py3.12,py3.13}-ariadne-v0.26.2
 
     {py3.6,py3.9,py3.10}-gql-v3.4.1
     {py3.7,py3.11,py3.12}-gql-v3.5.2
@@ -207,7 +202,7 @@ envlist =
     {py3.8,py3.10,py3.11}-strawberry-v0.209.8
     {py3.8,py3.11,py3.12}-strawberry-v0.228.0
     {py3.8,py3.12,py3.13}-strawberry-v0.247.2
-    {py3.9,py3.12,py3.13}-strawberry-v0.265.1
+    {py3.9,py3.12,py3.13}-strawberry-v0.266.0
 
 
     # ~~~ Network ~~~
@@ -265,8 +260,13 @@ envlist =
 
 
     # ~~~ Web 2 ~~~
+    {py3.6,py3.7}-aiohttp-v3.4.4
+    {py3.6,py3.8,py3.9}-aiohttp-v3.7.4
+    {py3.8,py3.12,py3.13}-aiohttp-v3.10.9
+    {py3.9,py3.12,py3.13}-aiohttp-v3.11.18
+
     {py3.6,py3.7}-bottle-v0.12.25
-    {py3.6,py3.8,py3.9}-bottle-v0.13.2
+    {py3.8,py3.12,py3.13}-bottle-v0.13.3
 
     {py3.6}-falcon-v1.4.1
     {py3.6,py3.7}-falcon-v2.0.0
@@ -337,14 +337,6 @@ deps =
 
     # === Integrations ===
 
-    # AIOHTTP
-    aiohttp-v3.4: aiohttp~=3.4.0
-    aiohttp-v3.8: aiohttp~=3.8.0
-    aiohttp-latest: aiohttp
-    aiohttp: pytest-aiohttp
-    aiohttp-v3.8: pytest-asyncio
-    aiohttp-latest: pytest-asyncio
-
     # Anthropic
     anthropic: pytest-asyncio
     anthropic-v{0.16,0.28}: httpx<0.28.0
@@ -569,7 +561,7 @@ deps =
     ariadne-v0.20.1: ariadne==0.20.1
     ariadne-v0.22: ariadne==0.22
     ariadne-v0.24.0: ariadne==0.24.0
-    ariadne-v0.26.1: ariadne==0.26.1
+    ariadne-v0.26.2: ariadne==0.26.2
     ariadne: fastapi
     ariadne: flask
     ariadne: httpx
@@ -589,7 +581,7 @@ deps =
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
     strawberry-v0.228.0: strawberry-graphql[fastapi,flask]==0.228.0
     strawberry-v0.247.2: strawberry-graphql[fastapi,flask]==0.247.2
-    strawberry-v0.265.1: strawberry-graphql[fastapi,flask]==0.265.1
+    strawberry-v0.266.0: strawberry-graphql[fastapi,flask]==0.266.0
     strawberry: httpx
     strawberry-v0.209.8: pydantic<2.11
     strawberry-v0.228.0: pydantic<2.11
@@ -706,8 +698,15 @@ deps =
 
 
     # ~~~ Web 2 ~~~
+    aiohttp-v3.4.4: aiohttp==3.4.4
+    aiohttp-v3.7.4: aiohttp==3.7.4
+    aiohttp-v3.10.9: aiohttp==3.10.9
+    aiohttp-v3.11.18: aiohttp==3.11.18
+    aiohttp: pytest-aiohttp
+    aiohttp: pytest-asyncio
+
     bottle-v0.12.25: bottle==0.12.25
-    bottle-v0.13.2: bottle==0.13.2
+    bottle-v0.13.3: bottle==0.13.3
     bottle: werkzeug<2.1.0
 
     falcon-v1.4.1: falcon==1.4.1

From a87ea00544c89d01237b93b31df04567c752a389 Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Tue, 22 Apr 2025 16:07:03 +0200
Subject: [PATCH 2/8] .

---
 scripts/populate_tox/config.py | 5 ++---
 tox.ini                        | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
index a730795200..a8833a3422 100644
--- a/scripts/populate_tox/config.py
+++ b/scripts/populate_tox/config.py
@@ -8,8 +8,6 @@
 TEST_SUITE_CONFIG = {
     #
     # AIOHTTP
-    # aiohttp-v3.4: aiohttp~=3.4.0
-    # aiohttp-v3.8: aiohttp~=3.8.0
     # aiohttp-latest: aiohttp
     # aiohttp: pytest-aiohttp
     # aiohttp-v3.8: pytest-asyncio
@@ -17,7 +15,8 @@
     "aiohttp": {
         "package": "aiohttp",
         "deps": {
-            "*": ["pytest-aiohttp", "pytest-asyncio"],
+            "*": ["pytest-aiohttp"],
+            ">=3.8": ["pytest-asyncio"],
         },
     },
     "ariadne": {
diff --git a/tox.ini b/tox.ini
index 8a127b35dd..2d45717a20 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-04-22T14:02:00.594337+00:00
+# Last generated: 2025-04-22T14:06:48.318198+00:00
 
 [tox]
 requires =
@@ -703,7 +703,8 @@ deps =
     aiohttp-v3.10.9: aiohttp==3.10.9
     aiohttp-v3.11.18: aiohttp==3.11.18
     aiohttp: pytest-aiohttp
-    aiohttp: pytest-asyncio
+    aiohttp-v3.10.9: pytest-asyncio
+    aiohttp-v3.11.18: pytest-asyncio
 
     bottle-v0.12.25: bottle==0.12.25
     bottle-v0.13.3: bottle==0.13.3

From 5afb12c8f2786326dd7438032e625a5d5c4573cb Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Tue, 22 Apr 2025 16:16:01 +0200
Subject: [PATCH 3/8] we were only testing 3.7+

---
 scripts/populate_tox/config.py | 1 +
 tox.ini                        | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
index a8833a3422..751115f574 100644
--- a/scripts/populate_tox/config.py
+++ b/scripts/populate_tox/config.py
@@ -18,6 +18,7 @@
             "*": ["pytest-aiohttp"],
             ">=3.8": ["pytest-asyncio"],
         },
+        "python": ">=3.7",
     },
     "ariadne": {
         "package": "ariadne",
diff --git a/tox.ini b/tox.ini
index 2d45717a20..9956f75faf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-04-22T14:06:48.318198+00:00
+# Last generated: 2025-04-22T14:14:07.999164+00:00
 
 [tox]
 requires =
@@ -260,8 +260,8 @@ envlist =
 
 
     # ~~~ Web 2 ~~~
-    {py3.6,py3.7}-aiohttp-v3.4.4
-    {py3.6,py3.8,py3.9}-aiohttp-v3.7.4
+    {py3.7}-aiohttp-v3.4.4
+    {py3.7,py3.8,py3.9}-aiohttp-v3.7.4
     {py3.8,py3.12,py3.13}-aiohttp-v3.10.9
     {py3.9,py3.12,py3.13}-aiohttp-v3.11.18
 

From fe69a5c002ed3dc97f63a56c76ae2d3d116a4c62 Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Tue, 22 Apr 2025 17:06:24 +0200
Subject: [PATCH 4/8] .

---
 tests/integrations/aiohttp/test_aiohttp.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
index ef7c04e90a..827f989a2f 100644
--- a/tests/integrations/aiohttp/test_aiohttp.py
+++ b/tests/integrations/aiohttp/test_aiohttp.py
@@ -1,6 +1,6 @@
 import asyncio
 import json
-import sys
+
 from contextlib import suppress
 from unittest import mock
 
@@ -474,14 +474,6 @@ async def hello(request):
     assert error_event["contexts"]["trace"]["trace_id"] == trace_id
 
 
-if sys.version_info < (3, 12):
-    # `loop` was deprecated in `pytest-aiohttp`
-    # in favor of `event_loop` from `pytest-asyncio`
-    @pytest.fixture
-    def event_loop(loop):
-        yield loop
-
-
 @pytest.mark.asyncio
 async def test_crumb_capture(
     sentry_init, aiohttp_raw_server, aiohttp_client, event_loop, capture_events

From 258d0a7bae1fba831db1a2ae945e8d1807953dbf Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Tue, 22 Apr 2025 17:10:45 +0200
Subject: [PATCH 5/8] .

---
 tests/integrations/aiohttp/test_aiohttp.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
index 827f989a2f..06859b127f 100644
--- a/tests/integrations/aiohttp/test_aiohttp.py
+++ b/tests/integrations/aiohttp/test_aiohttp.py
@@ -5,6 +5,12 @@
 from unittest import mock
 
 import pytest
+
+try:
+    import pytest_asyncio
+except ImportError:
+    pytest_asyncio = None
+
 from aiohttp import web, ClientSession
 from aiohttp.client import ServerDisconnectedError
 from aiohttp.web_request import Request
@@ -21,6 +27,14 @@
 from tests.conftest import ApproxDict
 
 
+if pytest_asyncio is None:
+    # `loop` was deprecated in `pytest-aiohttp`
+    # in favor of `event_loop` from `pytest-asyncio`
+    @pytest.fixture
+    def event_loop(loop):
+        yield loop
+
+
 @pytest.mark.asyncio
 async def test_basic(sentry_init, aiohttp_client, capture_events):
     sentry_init(integrations=[AioHttpIntegration()])

From 720739534c01bfb0cb5c3fe233f91411768002ec Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Tue, 22 Apr 2025 17:15:46 +0200
Subject: [PATCH 6/8] remove comment

---
 scripts/populate_tox/config.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
index 751115f574..f874ff8a9c 100644
--- a/scripts/populate_tox/config.py
+++ b/scripts/populate_tox/config.py
@@ -6,12 +6,6 @@
 # See scripts/populate_tox/README.md for more info on the format and examples.
 
 TEST_SUITE_CONFIG = {
-    #
-    # AIOHTTP
-    # aiohttp-latest: aiohttp
-    # aiohttp: pytest-aiohttp
-    # aiohttp-v3.8: pytest-asyncio
-    # aiohttp-latest: pytest-asyncio
     "aiohttp": {
         "package": "aiohttp",
         "deps": {

From f52bae755016699279927a57370745237d5e0a85 Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Wed, 23 Apr 2025 09:47:22 +0200
Subject: [PATCH 7/8] tests: Fix version picking in toxgen

---
 scripts/populate_tox/populate_tox.py |  6 ++--
 tox.ini                              | 51 ++++++++++++----------------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py
index 11ea94c0f4..9972cbe9fc 100644
--- a/scripts/populate_tox/populate_tox.py
+++ b/scripts/populate_tox/populate_tox.py
@@ -190,10 +190,10 @@ def _prefilter_releases(
             if (
                 version.major == saved_version.major
                 and version.minor == saved_version.minor
-                and version.micro > saved_version.micro
             ):
-                # Don't save all patch versions of a release, just the newest one
-                filtered_releases[i] = version
+                if version.micro > saved_version.micro:
+                    # Don't save all patch versions of a release, just the newest one
+                    filtered_releases[i] = version
                 break
         else:
             filtered_releases.append(version)
diff --git a/tox.ini b/tox.ini
index 9497708ff8..49411b3189 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-04-17T11:01:25.976599+00:00
+# Last generated: 2025-04-23T07:46:44.042662+00:00
 
 [tox]
 requires =
@@ -145,8 +145,8 @@ envlist =
 
     # ~~~ AI ~~~
     {py3.9,py3.10,py3.11}-cohere-v5.4.0
-    {py3.9,py3.11,py3.12}-cohere-v5.9.4
-    {py3.9,py3.11,py3.12}-cohere-v5.13.9
+    {py3.9,py3.11,py3.12}-cohere-v5.8.1
+    {py3.9,py3.11,py3.12}-cohere-v5.11.4
     {py3.9,py3.11,py3.12}-cohere-v5.15.0
 
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2
@@ -167,9 +167,8 @@ envlist =
     {py3.6,py3.7}-redis_py_cluster_legacy-v2.0.0
     {py3.6,py3.7,py3.8}-redis_py_cluster_legacy-v2.1.3
 
-    {py3.6,py3.7}-sqlalchemy-v1.3.9
+    {py3.6,py3.8,py3.9}-sqlalchemy-v1.3.24
     {py3.6,py3.11,py3.12}-sqlalchemy-v1.4.54
-    {py3.7,py3.10,py3.11}-sqlalchemy-v2.0.9
     {py3.7,py3.12,py3.13}-sqlalchemy-v2.0.40
 
 
@@ -195,7 +194,7 @@ envlist =
     {py3.8,py3.10,py3.11}-ariadne-v0.20.1
     {py3.8,py3.11,py3.12}-ariadne-v0.22
     {py3.8,py3.11,py3.12}-ariadne-v0.24.0
-    {py3.9,py3.12,py3.13}-ariadne-v0.26.1
+    {py3.9,py3.12,py3.13}-ariadne-v0.26.2
 
     {py3.6,py3.9,py3.10}-gql-v3.4.1
     {py3.7,py3.11,py3.12}-gql-v3.5.2
@@ -207,7 +206,7 @@ envlist =
     {py3.8,py3.10,py3.11}-strawberry-v0.209.8
     {py3.8,py3.11,py3.12}-strawberry-v0.228.0
     {py3.8,py3.12,py3.13}-strawberry-v0.247.2
-    {py3.9,py3.12,py3.13}-strawberry-v0.265.1
+    {py3.9,py3.12,py3.13}-strawberry-v0.266.0
 
 
     # ~~~ Network ~~~
@@ -240,12 +239,11 @@ envlist =
 
 
     # ~~~ Web 1 ~~~
-    {py3.6}-django-v1.11.9
     {py3.6,py3.7}-django-v1.11.29
     {py3.6,py3.8,py3.9}-django-v2.2.28
     {py3.6,py3.9,py3.10}-django-v3.2.25
     {py3.8,py3.11,py3.12}-django-v4.2.20
-    {py3.10,py3.11,py3.12}-django-v5.0.9
+    {py3.10,py3.11,py3.12}-django-v5.0.14
     {py3.10,py3.12,py3.13}-django-v5.2
 
     {py3.6,py3.7,py3.8}-flask-v1.1.4
@@ -266,7 +264,7 @@ envlist =
 
     # ~~~ Web 2 ~~~
     {py3.6,py3.7}-bottle-v0.12.25
-    {py3.6,py3.8,py3.9}-bottle-v0.13.2
+    {py3.8,py3.12,py3.13}-bottle-v0.13.3
 
     {py3.6}-falcon-v1.4.1
     {py3.6,py3.7}-falcon-v2.0.0
@@ -296,11 +294,11 @@ envlist =
     # ~~~ Misc ~~~
     {py3.6,py3.12,py3.13}-loguru-v0.7.3
 
-    {py3.6}-trytond-v4.6.9
+    {py3.6}-trytond-v4.6.22
     {py3.6}-trytond-v4.8.18
     {py3.6,py3.7,py3.8}-trytond-v5.8.16
     {py3.8,py3.10,py3.11}-trytond-v6.8.17
-    {py3.8,py3.11,py3.12}-trytond-v7.0.9
+    {py3.8,py3.11,py3.12}-trytond-v7.0.29
     {py3.8,py3.11,py3.12}-trytond-v7.4.9
 
     {py3.7,py3.12,py3.13}-typer-v0.15.2
@@ -517,8 +515,8 @@ deps =
 
     # ~~~ AI ~~~
     cohere-v5.4.0: cohere==5.4.0
-    cohere-v5.9.4: cohere==5.9.4
-    cohere-v5.13.9: cohere==5.13.9
+    cohere-v5.8.1: cohere==5.8.1
+    cohere-v5.11.4: cohere==5.11.4
     cohere-v5.15.0: cohere==5.15.0
 
     huggingface_hub-v0.22.2: huggingface_hub==0.22.2
@@ -540,9 +538,8 @@ deps =
     redis_py_cluster_legacy-v2.0.0: redis-py-cluster==2.0.0
     redis_py_cluster_legacy-v2.1.3: redis-py-cluster==2.1.3
 
-    sqlalchemy-v1.3.9: sqlalchemy==1.3.9
+    sqlalchemy-v1.3.24: sqlalchemy==1.3.24
     sqlalchemy-v1.4.54: sqlalchemy==1.4.54
-    sqlalchemy-v2.0.9: sqlalchemy==2.0.9
     sqlalchemy-v2.0.40: sqlalchemy==2.0.40
 
 
@@ -569,7 +566,7 @@ deps =
     ariadne-v0.20.1: ariadne==0.20.1
     ariadne-v0.22: ariadne==0.22
     ariadne-v0.24.0: ariadne==0.24.0
-    ariadne-v0.26.1: ariadne==0.26.1
+    ariadne-v0.26.2: ariadne==0.26.2
     ariadne: fastapi
     ariadne: flask
     ariadne: httpx
@@ -589,7 +586,7 @@ deps =
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
     strawberry-v0.228.0: strawberry-graphql[fastapi,flask]==0.228.0
     strawberry-v0.247.2: strawberry-graphql[fastapi,flask]==0.247.2
-    strawberry-v0.265.1: strawberry-graphql[fastapi,flask]==0.265.1
+    strawberry-v0.266.0: strawberry-graphql[fastapi,flask]==0.266.0
     strawberry: httpx
     strawberry-v0.209.8: pydantic<2.11
     strawberry-v0.228.0: pydantic<2.11
@@ -633,12 +630,11 @@ deps =
 
 
     # ~~~ Web 1 ~~~
-    django-v1.11.9: django==1.11.9
     django-v1.11.29: django==1.11.29
     django-v2.2.28: django==2.2.28
     django-v3.2.25: django==3.2.25
     django-v4.2.20: django==4.2.20
-    django-v5.0.9: django==5.0.9
+    django-v5.0.14: django==5.0.14
     django-v5.2: django==5.2
     django: psycopg2-binary
     django: djangorestframework
@@ -646,24 +642,21 @@ deps =
     django: Werkzeug
     django-v3.2.25: pytest-asyncio
     django-v4.2.20: pytest-asyncio
-    django-v5.0.9: pytest-asyncio
+    django-v5.0.14: pytest-asyncio
     django-v5.2: pytest-asyncio
     django-v2.2.28: six
-    django-v1.11.9: djangorestframework>=3.0,<4.0
-    django-v1.11.9: Werkzeug<2.1.0
     django-v1.11.29: djangorestframework>=3.0,<4.0
     django-v1.11.29: Werkzeug<2.1.0
     django-v2.2.28: djangorestframework>=3.0,<4.0
     django-v2.2.28: Werkzeug<2.1.0
     django-v3.2.25: djangorestframework>=3.0,<4.0
     django-v3.2.25: Werkzeug<2.1.0
-    django-v1.11.9: pytest-django<4.0
     django-v1.11.29: pytest-django<4.0
     django-v2.2.28: pytest-django<4.0
     django-v2.2.28: channels[daphne]
     django-v3.2.25: channels[daphne]
     django-v4.2.20: channels[daphne]
-    django-v5.0.9: channels[daphne]
+    django-v5.0.14: channels[daphne]
     django-v5.2: channels[daphne]
 
     flask-v1.1.4: flask==1.1.4
@@ -707,7 +700,7 @@ deps =
 
     # ~~~ Web 2 ~~~
     bottle-v0.12.25: bottle==0.12.25
-    bottle-v0.13.2: bottle==0.13.2
+    bottle-v0.13.3: bottle==0.13.3
     bottle: werkzeug<2.1.0
 
     falcon-v1.4.1: falcon==1.4.1
@@ -756,14 +749,14 @@ deps =
     # ~~~ Misc ~~~
     loguru-v0.7.3: loguru==0.7.3
 
-    trytond-v4.6.9: trytond==4.6.9
+    trytond-v4.6.22: trytond==4.6.22
     trytond-v4.8.18: trytond==4.8.18
     trytond-v5.8.16: trytond==5.8.16
     trytond-v6.8.17: trytond==6.8.17
-    trytond-v7.0.9: trytond==7.0.9
+    trytond-v7.0.29: trytond==7.0.29
     trytond-v7.4.9: trytond==7.4.9
     trytond: werkzeug
-    trytond-v4.6.9: werkzeug<1.0
+    trytond-v4.6.22: werkzeug<1.0
     trytond-v4.8.18: werkzeug<1.0
 
     typer-v0.15.2: typer==0.15.2

From e01978a15337278f11c402960f877f39baa00e89 Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Wed, 23 Apr 2025 09:53:08 +0200
Subject: [PATCH 8/8] move comment

---
 scripts/populate_tox/populate_tox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py
index 9972cbe9fc..f741496f93 100644
--- a/scripts/populate_tox/populate_tox.py
+++ b/scripts/populate_tox/populate_tox.py
@@ -191,8 +191,8 @@ def _prefilter_releases(
                 version.major == saved_version.major
                 and version.minor == saved_version.minor
             ):
+                # Don't save all patch versions of a release, just the newest one
                 if version.micro > saved_version.micro:
-                    # Don't save all patch versions of a release, just the newest one
                     filtered_releases[i] = version
                 break
         else: