Skip to content

Commit 404931c

Browse files
xrmxxrmx
committed
Fix tox
1 parent 9fa39bb commit 404931c

File tree

3 files changed

+144
-19
lines changed

3 files changed

+144
-19
lines changed

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2993,8 +2993,8 @@ jobs:
29932993
- name: Run tests
29942994
run: tox -e py39-test-processor-baggage -- -ra
29952995

2996-
py39-test-opamp-client:
2997-
name: opamp-client
2996+
py39-test-opamp-client-latest:
2997+
name: opamp-client-latest
29982998
runs-on: ubuntu-latest
29992999
timeout-minutes: 30
30003000
steps:
@@ -3021,4 +3021,34 @@ jobs:
30213021
run: pip install tox-uv
30223022

30233023
- name: Run tests
3024-
run: tox -e py39-test-opamp-client -- -ra
3024+
run: tox -e py39-test-opamp-client-latest -- -ra
3025+
3026+
py39-test-opamp-client-lowest:
3027+
name: opamp-client-lowest
3028+
runs-on: ubuntu-latest
3029+
timeout-minutes: 30
3030+
steps:
3031+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
3032+
uses: actions/checkout@v4
3033+
with:
3034+
repository: open-telemetry/opentelemetry-python-contrib
3035+
ref: ${{ env.CONTRIB_REPO_SHA }}
3036+
3037+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
3038+
uses: actions/checkout@v4
3039+
with:
3040+
repository: open-telemetry/opentelemetry-python
3041+
ref: ${{ env.CORE_REPO_SHA }}
3042+
path: opentelemetry-python
3043+
3044+
- name: Set up Python 3.9
3045+
uses: actions/setup-python@v5
3046+
with:
3047+
python-version: "3.9"
3048+
architecture: "x64"
3049+
3050+
- name: Install tox
3051+
run: pip install tox-uv
3052+
3053+
- name: Run tests
3054+
run: tox -e py39-test-opamp-client-lowest -- -ra

‎.github/workflows/test_2.yml‎

Lines changed: 110 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,8 +1172,8 @@ jobs:
11721172
- name: Run tests
11731173
run: tox -e pypy3-test-processor-baggage -- -ra
11741174

1175-
py39-test-opamp-client_ubuntu-latest:
1176-
name: opamp-client 3.9 Ubuntu
1175+
py39-test-opamp-client-latest_ubuntu-latest:
1176+
name: opamp-client-latest 3.9 Ubuntu
11771177
runs-on: ubuntu-latest
11781178
timeout-minutes: 30
11791179
steps:
@@ -1189,10 +1189,48 @@ jobs:
11891189
run: pip install tox-uv
11901190

11911191
- name: Run tests
1192-
run: tox -e py39-test-opamp-client -- -ra
1192+
run: tox -e py39-test-opamp-client-latest -- -ra
11931193

1194-
py310-test-opamp-client_ubuntu-latest:
1195-
name: opamp-client 3.10 Ubuntu
1194+
py39-test-opamp-client-lowest_ubuntu-latest:
1195+
name: opamp-client-lowest 3.9 Ubuntu
1196+
runs-on: ubuntu-latest
1197+
timeout-minutes: 30
1198+
steps:
1199+
- name: Checkout repo @ SHA - ${{ github.sha }}
1200+
uses: actions/checkout@v4
1201+
1202+
- name: Set up Python 3.9
1203+
uses: actions/setup-python@v5
1204+
with:
1205+
python-version: "3.9"
1206+
1207+
- name: Install tox
1208+
run: pip install tox-uv
1209+
1210+
- name: Run tests
1211+
run: tox -e py39-test-opamp-client-lowest -- -ra
1212+
1213+
py310-test-opamp-client-latest_ubuntu-latest:
1214+
name: opamp-client-latest 3.10 Ubuntu
1215+
runs-on: ubuntu-latest
1216+
timeout-minutes: 30
1217+
steps:
1218+
- name: Checkout repo @ SHA - ${{ github.sha }}
1219+
uses: actions/checkout@v4
1220+
1221+
- name: Set up Python 3.10
1222+
uses: actions/setup-python@v5
1223+
with:
1224+
python-version: "3.10"
1225+
1226+
- name: Install tox
1227+
run: pip install tox-uv
1228+
1229+
- name: Run tests
1230+
run: tox -e py310-test-opamp-client-latest -- -ra
1231+
1232+
py310-test-opamp-client-lowest_ubuntu-latest:
1233+
name: opamp-client-lowest 3.10 Ubuntu
11961234
runs-on: ubuntu-latest
11971235
timeout-minutes: 30
11981236
steps:
@@ -1208,10 +1246,29 @@ jobs:
12081246
run: pip install tox-uv
12091247

12101248
- name: Run tests
1211-
run: tox -e py310-test-opamp-client -- -ra
1249+
run: tox -e py310-test-opamp-client-lowest -- -ra
1250+
1251+
py311-test-opamp-client-latest_ubuntu-latest:
1252+
name: opamp-client-latest 3.11 Ubuntu
1253+
runs-on: ubuntu-latest
1254+
timeout-minutes: 30
1255+
steps:
1256+
- name: Checkout repo @ SHA - ${{ github.sha }}
1257+
uses: actions/checkout@v4
1258+
1259+
- name: Set up Python 3.11
1260+
uses: actions/setup-python@v5
1261+
with:
1262+
python-version: "3.11"
1263+
1264+
- name: Install tox
1265+
run: pip install tox-uv
1266+
1267+
- name: Run tests
1268+
run: tox -e py311-test-opamp-client-latest -- -ra
12121269

1213-
py311-test-opamp-client_ubuntu-latest:
1214-
name: opamp-client 3.11 Ubuntu
1270+
py311-test-opamp-client-lowest_ubuntu-latest:
1271+
name: opamp-client-lowest 3.11 Ubuntu
12151272
runs-on: ubuntu-latest
12161273
timeout-minutes: 30
12171274
steps:
@@ -1227,10 +1284,29 @@ jobs:
12271284
run: pip install tox-uv
12281285

12291286
- name: Run tests
1230-
run: tox -e py311-test-opamp-client -- -ra
1287+
run: tox -e py311-test-opamp-client-lowest -- -ra
1288+
1289+
py312-test-opamp-client-latest_ubuntu-latest:
1290+
name: opamp-client-latest 3.12 Ubuntu
1291+
runs-on: ubuntu-latest
1292+
timeout-minutes: 30
1293+
steps:
1294+
- name: Checkout repo @ SHA - ${{ github.sha }}
1295+
uses: actions/checkout@v4
1296+
1297+
- name: Set up Python 3.12
1298+
uses: actions/setup-python@v5
1299+
with:
1300+
python-version: "3.12"
1301+
1302+
- name: Install tox
1303+
run: pip install tox-uv
1304+
1305+
- name: Run tests
1306+
run: tox -e py312-test-opamp-client-latest -- -ra
12311307

1232-
py312-test-opamp-client_ubuntu-latest:
1233-
name: opamp-client 3.12 Ubuntu
1308+
py312-test-opamp-client-lowest_ubuntu-latest:
1309+
name: opamp-client-lowest 3.12 Ubuntu
12341310
runs-on: ubuntu-latest
12351311
timeout-minutes: 30
12361312
steps:
@@ -1246,10 +1322,29 @@ jobs:
12461322
run: pip install tox-uv
12471323

12481324
- name: Run tests
1249-
run: tox -e py312-test-opamp-client -- -ra
1325+
run: tox -e py312-test-opamp-client-lowest -- -ra
1326+
1327+
py313-test-opamp-client-latest_ubuntu-latest:
1328+
name: opamp-client-latest 3.13 Ubuntu
1329+
runs-on: ubuntu-latest
1330+
timeout-minutes: 30
1331+
steps:
1332+
- name: Checkout repo @ SHA - ${{ github.sha }}
1333+
uses: actions/checkout@v4
1334+
1335+
- name: Set up Python 3.13
1336+
uses: actions/setup-python@v5
1337+
with:
1338+
python-version: "3.13"
1339+
1340+
- name: Install tox
1341+
run: pip install tox-uv
1342+
1343+
- name: Run tests
1344+
run: tox -e py313-test-opamp-client-latest -- -ra
12501345

1251-
py313-test-opamp-client_ubuntu-latest:
1252-
name: opamp-client 3.13 Ubuntu
1346+
py313-test-opamp-client-lowest_ubuntu-latest:
1347+
name: opamp-client-lowest 3.13 Ubuntu
12531348
runs-on: ubuntu-latest
12541349
timeout-minutes: 30
12551350
steps:
@@ -1265,4 +1360,4 @@ jobs:
12651360
run: pip install tox-uv
12661361

12671362
- name: Run tests
1268-
run: tox -e py313-test-opamp-client -- -ra
1363+
run: tox -e py313-test-opamp-client-lowest -- -ra

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ envlist =
428428
lint-processor-baggage
429429

430430
; opentelemetry-opamp-client
431-
py3{9,10,11,12,13}-test-opamp-client
431+
py3{9,10,11,12,13}-test-opamp-client-{latest,lowest}
432432
; https://github.com/kevin1024/vcrpy/pull/775#issuecomment-1847849962
433433
; pypy3-test-opamp-client
434434
lint-opamp-client

0 commit comments

Comments
 (0)