Merge branch 'ivana/fix-toxgen' into ivana/toxgen/migrate-aiohttp

Author: sentrivana

scripts/populate_tox/populate_tox.py

@@ -189,10 +189,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:
+                    filtered_releases[i] = version
                 break
         else:
             filtered_releases.append(version)

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:14:07.999164+00:00
+# Last generated: 2025-04-23T08:07:00.653648+00:00
 
 [tox]
 requires =
@@ -140,8 +140,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
@@ -162,9 +162,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
 
 
@@ -235,12 +234,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
@@ -261,8 +259,8 @@ envlist =
 
     # ~~~ Web 2 ~~~
     {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.7}-aiohttp-v3.6.3
+    {py3.7,py3.9,py3.10}-aiohttp-v3.8.6
     {py3.9,py3.12,py3.13}-aiohttp-v3.11.18
 
     {py3.6,py3.7}-bottle-v0.12.25
@@ -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
@@ -509,8 +507,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
@@ -532,9 +530,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
 
 
@@ -625,37 +622,33 @@ 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
     django: pytest-django
     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
@@ -699,11 +692,11 @@ 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.6.3: aiohttp==3.6.3
+    aiohttp-v3.8.6: aiohttp==3.8.6
     aiohttp-v3.11.18: aiohttp==3.11.18
     aiohttp: pytest-aiohttp
-    aiohttp-v3.10.9: pytest-asyncio
+    aiohttp-v3.8.6: pytest-asyncio
     aiohttp-v3.11.18: pytest-asyncio
 
     bottle-v0.12.25: bottle==0.12.25
@@ -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