Skip to content

Commit 841a3d5

Browse files
sentrivanasentrivana
committed
tests: Move httpx under toxgen
1 parent 4c02bdf commit 841a3d5

File tree

5 files changed

+45
-125
lines changed

5 files changed

+45
-125
lines changed

‎.github/workflows/test-integrations-network.yml‎

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -22,73 +22,6 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-network-latest:
26-
name: Network (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.9","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
40-
steps:
41-
- uses: actions/checkout@v5.0.0
42-
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
44-
with:
45-
python-version: ${{ matrix.python-version }}
46-
allow-prereleases: true
47-
- name: Setup Test Env
48-
run: |
49-
pip install "coverage[toml]" tox
50-
- name: Erase coverage
51-
run: |
52-
coverage erase
53-
- name: Test grpc latest
54-
run: |
55-
set -x # print commands that are executed
56-
./scripts/runtox.sh "py${{ matrix.python-version }}-grpc-latest"
57-
- name: Test httpx latest
58-
run: |
59-
set -x # print commands that are executed
60-
./scripts/runtox.sh "py${{ matrix.python-version }}-httpx-latest"
61-
- name: Test requests latest
62-
run: |
63-
set -x # print commands that are executed
64-
./scripts/runtox.sh "py${{ matrix.python-version }}-requests-latest"
65-
- name: Generate coverage XML (Python 3.6)
66-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
67-
run: |
68-
export COVERAGE_RCFILE=.coveragerc36
69-
coverage combine .coverage-sentry-*
70-
coverage xml --ignore-errors
71-
- name: Generate coverage XML
72-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
73-
run: |
74-
coverage combine .coverage-sentry-*
75-
coverage xml
76-
- name: Upload coverage to Codecov
77-
if: ${{ !cancelled() }}
78-
uses: codecov/codecov-action@v5.5.0
79-
with:
80-
token: ${{ secrets.CODECOV_TOKEN }}
81-
files: coverage.xml
82-
# make sure no plugins alter our coverage reports
83-
plugins: noop
84-
verbose: true
85-
- name: Upload test results to Codecov
86-
if: ${{ !cancelled() }}
87-
uses: codecov/test-results-action@v1
88-
with:
89-
token: ${{ secrets.CODECOV_TOKEN }}
90-
files: .junitxml
91-
verbose: true
9225
test-network-pinned:
9326
name: Network (pinned)
9427
timeout-minutes: 30

‎scripts/populate_tox/config.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,19 @@
150150
},
151151
"python": ">=3.7",
152152
},
153+
"httpx": {
154+
"package": "httpx",
155+
"deps": {
156+
"*": ["pytest-httpx", "anyio<4.0.0"],
157+
"<0.17": ["pytest-httpx==0.10.0"],
158+
"<0.19": ["pytest-httpx==0.12.0"],
159+
"<0.21": ["pytest-httpx==0.14.0"],
160+
"<0.23": ["pytest-httpx==0.19.0"],
161+
"<0.24": ["pytest-httpx==0.21.0"],
162+
"<0.25": ["pytest-httpx==0.22.0"],
163+
"<0.26": ["pytest-httpx==0.25.0"],
164+
},
165+
},
153166
"huey": {
154167
"package": "huey",
155168
},

‎scripts/populate_tox/populate_tox.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
"potel",
7070
# Integrations that can be migrated -- we should eventually remove all
7171
# of these from the IGNORE list
72-
"httpx",
7372
"pure_eval",
7473
"ray",
7574
"redis",

‎scripts/populate_tox/tox.jinja‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ envlist =
4848
# GCP
4949
{py3.7}-gcp
5050

51-
# HTTPX
52-
{py3.6,py3.9}-httpx-v{0.16,0.18}
53-
{py3.6,py3.10}-httpx-v{0.20,0.22}
54-
{py3.7,py3.11,py3.12}-httpx-v{0.23,0.24}
55-
{py3.9,py3.11,py3.12}-httpx-v{0.25,0.27}
56-
{py3.9,py3.12,py3.13}-httpx-latest
57-
5851
# OpenTelemetry (OTel)
5952
{py3.7,py3.9,py3.12,py3.13}-opentelemetry
6053

@@ -149,27 +142,6 @@ deps =
149142
aws_lambda: requests
150143
aws_lambda: uvicorn
151144
152-
# HTTPX
153-
httpx-v0.16: pytest-httpx==0.10.0
154-
httpx-v0.18: pytest-httpx==0.12.0
155-
httpx-v0.20: pytest-httpx==0.14.0
156-
httpx-v0.22: pytest-httpx==0.19.0
157-
httpx-v0.23: pytest-httpx==0.21.0
158-
httpx-v0.24: pytest-httpx==0.22.0
159-
httpx-v0.25: pytest-httpx==0.25.0
160-
httpx: pytest-httpx
161-
# anyio is a dep of httpx
162-
httpx: anyio<4.0.0
163-
httpx-v0.16: httpx~=0.16.0
164-
httpx-v0.18: httpx~=0.18.0
165-
httpx-v0.20: httpx~=0.20.0
166-
httpx-v0.22: httpx~=0.22.0
167-
httpx-v0.23: httpx~=0.23.0
168-
httpx-v0.24: httpx~=0.24.0
169-
httpx-v0.25: httpx~=0.25.0
170-
httpx-v0.27: httpx~=0.27.0
171-
httpx-latest: httpx
172-
173145
# OpenTelemetry (OTel)
174146
opentelemetry: opentelemetry-distro
175147

‎tox.ini‎

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# The file (and all resulting CI YAMLs) then need to be regenerated via
1111
# "scripts/generate-test-files.sh".
1212
#
13-
# Last generated: 2025-09-08T11:35:09.849536+00:00
13+
# Last generated: 2025-09-08T12:10:30.256404+00:00
1414

1515
[tox]
1616
requires =
@@ -48,13 +48,6 @@ envlist =
4848
# GCP
4949
{py3.7}-gcp
5050

51-
# HTTPX
52-
{py3.6,py3.9}-httpx-v{0.16,0.18}
53-
{py3.6,py3.10}-httpx-v{0.20,0.22}
54-
{py3.7,py3.11,py3.12}-httpx-v{0.23,0.24}
55-
{py3.9,py3.11,py3.12}-httpx-v{0.25,0.27}
56-
{py3.9,py3.12,py3.13}-httpx-latest
57-
5851
# OpenTelemetry (OTel)
5952
{py3.7,py3.9,py3.12,py3.13}-opentelemetry
6053

@@ -218,6 +211,11 @@ envlist =
218211
{py3.9,py3.12,py3.13}-grpc-v1.74.0
219212
{py3.9,py3.12,py3.13}-grpc-v1.75.0rc1
220213

214+
{py3.6,py3.7,py3.8}-httpx-v0.6.8
215+
{py3.6,py3.7,py3.8}-httpx-v0.13.3
216+
{py3.6,py3.9,py3.10}-httpx-v0.20.0
217+
{py3.8,py3.11,py3.12}-httpx-v0.28.1
218+
221219

222220
# ~~~ Tasks ~~~
223221
{py3.7,py3.9,py3.10}-arq-v0.23
@@ -373,27 +371,6 @@ deps =
373371
aws_lambda: requests
374372
aws_lambda: uvicorn
375373

376-
# HTTPX
377-
httpx-v0.16: pytest-httpx==0.10.0
378-
httpx-v0.18: pytest-httpx==0.12.0
379-
httpx-v0.20: pytest-httpx==0.14.0
380-
httpx-v0.22: pytest-httpx==0.19.0
381-
httpx-v0.23: pytest-httpx==0.21.0
382-
httpx-v0.24: pytest-httpx==0.22.0
383-
httpx-v0.25: pytest-httpx==0.25.0
384-
httpx: pytest-httpx
385-
# anyio is a dep of httpx
386-
httpx: anyio<4.0.0
387-
httpx-v0.16: httpx~=0.16.0
388-
httpx-v0.18: httpx~=0.18.0
389-
httpx-v0.20: httpx~=0.20.0
390-
httpx-v0.22: httpx~=0.22.0
391-
httpx-v0.23: httpx~=0.23.0
392-
httpx-v0.24: httpx~=0.24.0
393-
httpx-v0.25: httpx~=0.25.0
394-
httpx-v0.27: httpx~=0.27.0
395-
httpx-latest: httpx
396-
397374
# OpenTelemetry (OTel)
398375
opentelemetry: opentelemetry-distro
399376

@@ -618,6 +595,32 @@ deps =
618595
grpc: types-protobuf
619596
grpc: pytest-asyncio
620597

598+
httpx-v0.6.8: httpx==0.6.8
599+
httpx-v0.13.3: httpx==0.13.3
600+
httpx-v0.20.0: httpx==0.20.0
601+
httpx-v0.28.1: httpx==0.28.1
602+
httpx: pytest-httpx
603+
httpx: anyio<4.0.0
604+
httpx-v0.6.8: pytest-httpx==0.10.0
605+
httpx-v0.13.3: pytest-httpx==0.10.0
606+
httpx-v0.6.8: pytest-httpx==0.12.0
607+
httpx-v0.13.3: pytest-httpx==0.12.0
608+
httpx-v0.6.8: pytest-httpx==0.14.0
609+
httpx-v0.13.3: pytest-httpx==0.14.0
610+
httpx-v0.20.0: pytest-httpx==0.14.0
611+
httpx-v0.6.8: pytest-httpx==0.19.0
612+
httpx-v0.13.3: pytest-httpx==0.19.0
613+
httpx-v0.20.0: pytest-httpx==0.19.0
614+
httpx-v0.6.8: pytest-httpx==0.21.0
615+
httpx-v0.13.3: pytest-httpx==0.21.0
616+
httpx-v0.20.0: pytest-httpx==0.21.0
617+
httpx-v0.6.8: pytest-httpx==0.22.0
618+
httpx-v0.13.3: pytest-httpx==0.22.0
619+
httpx-v0.20.0: pytest-httpx==0.22.0
620+
httpx-v0.6.8: pytest-httpx==0.25.0
621+
httpx-v0.13.3: pytest-httpx==0.25.0
622+
httpx-v0.20.0: pytest-httpx==0.25.0
623+
621624

622625
# ~~~ Tasks ~~~
623626
arq-v0.23: arq==0.23

0 commit comments

Comments
 (0)