From 95d1ff3baf95a88ae9ddd6be0555edf3df4cc0eb Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Tue, 21 Feb 2023 14:42:13 +0100 Subject: [PATCH 1/3] Updated outdated httpx test matrix --- .github/workflows/test-integration-httpx.yml | 2 +- tox.ini | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml index d8ac90e7bf..5cddda9b99 100644 --- a/.github/workflows/test-integration-httpx.yml +++ b/.github/workflows/test-integration-httpx.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.6","3.7","3.8","3.9","3.10","3.11"] + python-version: ["3.7","3.8","3.9","3.10","3.11"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6 diff --git a/tox.ini b/tox.ini index d1b058dc71..6258b8fd1f 100644 --- a/tox.ini +++ b/tox.ini @@ -66,7 +66,7 @@ envlist = {py2.7,py3.5,py3.6,py3.7}-falcon-v{1.4} {py2.7,py3.5,py3.6,py3.7}-falcon-v{2.0} {py3.5,py3.6,py3.7,py3.8,py3.9}-falcon-v{3.0} - + # FastAPI {py3.7,py3.8,py3.9,py3.10,py3.11}-fastapi @@ -79,10 +79,10 @@ envlist = {py3.7}-gcp # HTTPX - {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-httpx-v{0.16,0.17} - + {py3.7,py3.8,py3.9,py3.10,py3.11}-httpx-v{0.20,0.21,0.22,0.23} + # Huey - {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-huey-2 + {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-huey-2 # OpenTelemetry (OTel) {py3.7,py3.8,py3.9,py3.10,py3.11}-opentelemetry @@ -264,12 +264,15 @@ deps = flask-v2.0: Flask>=2.0,<2.1 # HTTPX - httpx-v0.16: httpx>=0.16,<0.17 - httpx-v0.17: httpx>=0.17,<0.18 - + httpx: pytest-httpx + httpx-v0.20: httpx>=0.20,<0.21 + httpx-v0.21: httpx>=0.21,<0.22 + httpx-v0.22: httpx>=0.22,<0.23 + httpx-v0.23: httpx>=0.23,<0.24 + # Huey huey-2: huey>=2.0 - + # OpenTelemetry (OTel) opentelemetry: opentelemetry-distro From 97d5762e4f5d9c015184eeeebe2f4151120eae05 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Tue, 21 Feb 2023 15:03:57 +0100 Subject: [PATCH 2/3] Updated test matrix --- tox.ini | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 6258b8fd1f..2dfafe77f7 100644 --- a/tox.ini +++ b/tox.ini @@ -79,7 +79,9 @@ envlist = {py3.7}-gcp # HTTPX - {py3.7,py3.8,py3.9,py3.10,py3.11}-httpx-v{0.20,0.21,0.22,0.23} + {py3.6,py3.7,py3.8,py3.9}-httpx-v{0.16,0.17,0.18} + {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-v{0.19,0.20,0.21,0.22} + {py3.7,py3.8,py3.9,py3.10,py3.11}-httpx-v{0.23} # Huey {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-huey-2 @@ -265,6 +267,10 @@ deps = # HTTPX httpx: pytest-httpx + httpx-v0.16: httpx>=0.16,<0.17 + httpx-v0.17: httpx>=0.17,<0.18 + httpx-v0.18: httpx>=0.18,<0.19 + httpx-v0.19: httpx>=0.19,<0.20 httpx-v0.20: httpx>=0.20,<0.21 httpx-v0.21: httpx>=0.21,<0.22 httpx-v0.22: httpx>=0.22,<0.23 From 3772c969849605c2a4ebccf739d0c00ad73126cd Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Tue, 21 Feb 2023 15:06:06 +0100 Subject: [PATCH 3/3] Updated test config --- .github/workflows/test-integration-httpx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml index 5cddda9b99..d8ac90e7bf 100644 --- a/.github/workflows/test-integration-httpx.yml +++ b/.github/workflows/test-integration-httpx.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7","3.8","3.9","3.10","3.11"] + python-version: ["3.6","3.7","3.8","3.9","3.10","3.11"] # python3.6 reached EOL and is no longer being supported on # new versions of hosted runners on Github Actions # ubuntu-20.04 is the last version that supported python3.6