From f4b0ac7406c75dce7b188368657e656a3dd5f371 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Fri, 19 Sep 2025 13:16:39 +0200 Subject: [PATCH] . --- scripts/populate_tox/config.py | 1 + scripts/populate_tox/populate_tox.py | 1 - scripts/populate_tox/tox.jinja | 6 ------ tox.ini | 22 +++++++++++----------- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index cf8b9ae9dc..b813334262 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -282,6 +282,7 @@ }, "requests": { "package": "requests", + "num_versions": 2, }, "sanic": { "package": "sanic", diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py index afcef05438..d2326a0b5b 100644 --- a/scripts/populate_tox/populate_tox.py +++ b/scripts/populate_tox/populate_tox.py @@ -70,7 +70,6 @@ # Integrations that can be migrated -- we should eventually remove all # of these from the IGNORE list "redis", - "requests", "rq", } diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index 40980197ab..5725425bc1 100755 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -60,9 +60,6 @@ envlist = {py3.7,py3.11,py3.12}-redis-v{5} {py3.7,py3.12,py3.13}-redis-latest - # Requests - {py3.6,py3.8,py3.12,py3.13}-requests - # RQ (Redis Queue) {py3.6}-rq-v{0.6} {py3.6,py3.9}-rq-v{0.13,1.0} @@ -147,9 +144,6 @@ deps = redis-v5: redis~=5.0 redis-latest: redis - # Requests - requests: requests>=2.0 - # RQ (Redis Queue) # https://github.com/jamesls/fakeredis/issues/245 rq-v{0.6}: fakeredis<1.0 diff --git a/tox.ini b/tox.ini index b646228b7f..97180ba7e7 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-09-18T10:42:56.677852+00:00 +# Last generated: 2025-09-19T11:11:54.624220+00:00 [tox] requires = @@ -60,9 +60,6 @@ envlist = {py3.7,py3.11,py3.12}-redis-v{5} {py3.7,py3.12,py3.13}-redis-latest - # Requests - {py3.6,py3.8,py3.12,py3.13}-requests - # RQ (Redis Queue) {py3.6}-rq-v{0.6} {py3.6,py3.9}-rq-v{0.13,1.0} @@ -109,7 +106,7 @@ envlist = {py3.10,py3.11,py3.12}-openai_agents-v0.0.19 {py3.10,py3.12,py3.13}-openai_agents-v0.1.0 {py3.10,py3.12,py3.13}-openai_agents-v0.2.11 - {py3.10,py3.12,py3.13}-openai_agents-v0.3.0 + {py3.10,py3.12,py3.13}-openai_agents-v0.3.1 {py3.8,py3.10,py3.11}-huggingface_hub-v0.24.7 {py3.8,py3.12,py3.13}-huggingface_hub-v0.28.1 @@ -121,7 +118,7 @@ envlist = {py3.6,py3.7}-boto3-v1.12.49 {py3.6,py3.9,py3.10}-boto3-v1.20.54 {py3.7,py3.11,py3.12}-boto3-v1.28.85 - {py3.9,py3.12,py3.13}-boto3-v1.40.33 + {py3.9,py3.12,py3.13}-boto3-v1.40.34 {py3.6,py3.7,py3.8}-chalice-v1.16.0 {py3.6,py3.7,py3.8}-chalice-v1.21.9 @@ -200,6 +197,9 @@ envlist = {py3.7,py3.10,py3.11}-httpx-v0.24.1 {py3.9,py3.11,py3.12}-httpx-v0.28.1 + {py3.6}-requests-v2.12.5 + {py3.9,py3.12,py3.13}-requests-v2.32.5 + # ~~~ Tasks ~~~ {py3.7,py3.9,py3.10}-arq-v0.23 @@ -383,9 +383,6 @@ deps = redis-v5: redis~=5.0 redis-latest: redis - # Requests - requests: requests>=2.0 - # RQ (Redis Queue) # https://github.com/jamesls/fakeredis/issues/245 rq-v{0.6}: fakeredis<1.0 @@ -460,7 +457,7 @@ deps = openai_agents-v0.0.19: openai-agents==0.0.19 openai_agents-v0.1.0: openai-agents==0.1.0 openai_agents-v0.2.11: openai-agents==0.2.11 - openai_agents-v0.3.0: openai-agents==0.3.0 + openai_agents-v0.3.1: openai-agents==0.3.1 openai_agents: pytest-asyncio huggingface_hub-v0.24.7: huggingface_hub==0.24.7 @@ -474,7 +471,7 @@ deps = boto3-v1.12.49: boto3==1.12.49 boto3-v1.20.54: boto3==1.20.54 boto3-v1.28.85: boto3==1.28.85 - boto3-v1.40.33: boto3==1.40.33 + boto3-v1.40.34: boto3==1.40.34 {py3.7,py3.8}-boto3: urllib3<2.0.0 chalice-v1.16.0: chalice==1.16.0 @@ -579,6 +576,9 @@ deps = httpx-v0.24.1: pytest-httpx==0.22.0 httpx-v0.28.1: pytest-httpx==0.35.0 + requests-v2.12.5: requests==2.12.5 + requests-v2.32.5: requests==2.32.5 + # ~~~ Tasks ~~~ arq-v0.23: arq==0.23