Skip to content

Commit 0baf1a0

Browse files
xrmxxrmx
committed
Fix tox
1 parent 99e190d commit 0baf1a0

3 files changed

Lines changed: 144 additions & 19 deletions

File tree

‎.github/workflows/core_contrib_test_0.yml‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2963,8 +2963,8 @@ jobs:
29632963
- name: Run tests
29642964
run: tox -e py39-test-processor-baggage -- -ra
29652965

2966-
py39-test-opamp-client:
2967-
name: opamp-client
2966+
py39-test-opamp-client-latest:
2967+
name: opamp-client-latest
29682968
runs-on: ubuntu-latest
29692969
timeout-minutes: 30
29702970
steps:
@@ -2991,4 +2991,34 @@ jobs:
29912991
run: pip install tox-uv
29922992

29932993
- name: Run tests
2994-
run: tox -e py39-test-opamp-client -- -ra
2994+
run: tox -e py39-test-opamp-client-latest -- -ra
2995+
2996+
py39-test-opamp-client-lowest:
2997+
name: opamp-client-lowest
2998+
runs-on: ubuntu-latest
2999+
timeout-minutes: 30
3000+
steps:
3001+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
3002+
uses: actions/checkout@v4
3003+
with:
3004+
repository: open-telemetry/opentelemetry-python-contrib
3005+
ref: ${{ env.CONTRIB_REPO_SHA }}
3006+
3007+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
3008+
uses: actions/checkout@v4
3009+
with:
3010+
repository: open-telemetry/opentelemetry-python
3011+
ref: ${{ env.CORE_REPO_SHA }}
3012+
path: opentelemetry-python
3013+
3014+
- name: Set up Python 3.9
3015+
uses: actions/setup-python@v5
3016+
with:
3017+
python-version: "3.9"
3018+
architecture: "x64"
3019+
3020+
- name: Install tox
3021+
run: pip install tox-uv
3022+
3023+
- name: Run tests
3024+
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
@@ -1076,8 +1076,8 @@ jobs:
10761076
- name: Run tests
10771077
run: tox -e pypy3-test-processor-baggage -- -ra
10781078

1079-
py39-test-opamp-client_ubuntu-latest:
1080-
name: opamp-client 3.9 Ubuntu
1079+
py39-test-opamp-client-latest_ubuntu-latest:
1080+
name: opamp-client-latest 3.9 Ubuntu
10811081
runs-on: ubuntu-latest
10821082
timeout-minutes: 30
10831083
steps:
@@ -1093,10 +1093,48 @@ jobs:
10931093
run: pip install tox-uv
10941094

10951095
- name: Run tests
1096-
run: tox -e py39-test-opamp-client -- -ra
1096+
run: tox -e py39-test-opamp-client-latest -- -ra
10971097

1098-
py310-test-opamp-client_ubuntu-latest:
1099-
name: opamp-client 3.10 Ubuntu
1098+
py39-test-opamp-client-lowest_ubuntu-latest:
1099+
name: opamp-client-lowest 3.9 Ubuntu
1100+
runs-on: ubuntu-latest
1101+
timeout-minutes: 30
1102+
steps:
1103+
- name: Checkout repo @ SHA - ${{ github.sha }}
1104+
uses: actions/checkout@v4
1105+
1106+
- name: Set up Python 3.9
1107+
uses: actions/setup-python@v5
1108+
with:
1109+
python-version: "3.9"
1110+
1111+
- name: Install tox
1112+
run: pip install tox-uv
1113+
1114+
- name: Run tests
1115+
run: tox -e py39-test-opamp-client-lowest -- -ra
1116+
1117+
py310-test-opamp-client-latest_ubuntu-latest:
1118+
name: opamp-client-latest 3.10 Ubuntu
1119+
runs-on: ubuntu-latest
1120+
timeout-minutes: 30
1121+
steps:
1122+
- name: Checkout repo @ SHA - ${{ github.sha }}
1123+
uses: actions/checkout@v4
1124+
1125+
- name: Set up Python 3.10
1126+
uses: actions/setup-python@v5
1127+
with:
1128+
python-version: "3.10"
1129+
1130+
- name: Install tox
1131+
run: pip install tox-uv
1132+
1133+
- name: Run tests
1134+
run: tox -e py310-test-opamp-client-latest -- -ra
1135+
1136+
py310-test-opamp-client-lowest_ubuntu-latest:
1137+
name: opamp-client-lowest 3.10 Ubuntu
11001138
runs-on: ubuntu-latest
11011139
timeout-minutes: 30
11021140
steps:
@@ -1112,10 +1150,29 @@ jobs:
11121150
run: pip install tox-uv
11131151

11141152
- name: Run tests
1115-
run: tox -e py310-test-opamp-client -- -ra
1153+
run: tox -e py310-test-opamp-client-lowest -- -ra
1154+
1155+
py311-test-opamp-client-latest_ubuntu-latest:
1156+
name: opamp-client-latest 3.11 Ubuntu
1157+
runs-on: ubuntu-latest
1158+
timeout-minutes: 30
1159+
steps:
1160+
- name: Checkout repo @ SHA - ${{ github.sha }}
1161+
uses: actions/checkout@v4
1162+
1163+
- name: Set up Python 3.11
1164+
uses: actions/setup-python@v5
1165+
with:
1166+
python-version: "3.11"
1167+
1168+
- name: Install tox
1169+
run: pip install tox-uv
1170+
1171+
- name: Run tests
1172+
run: tox -e py311-test-opamp-client-latest -- -ra
11161173

1117-
py311-test-opamp-client_ubuntu-latest:
1118-
name: opamp-client 3.11 Ubuntu
1174+
py311-test-opamp-client-lowest_ubuntu-latest:
1175+
name: opamp-client-lowest 3.11 Ubuntu
11191176
runs-on: ubuntu-latest
11201177
timeout-minutes: 30
11211178
steps:
@@ -1131,10 +1188,29 @@ jobs:
11311188
run: pip install tox-uv
11321189

11331190
- name: Run tests
1134-
run: tox -e py311-test-opamp-client -- -ra
1191+
run: tox -e py311-test-opamp-client-lowest -- -ra
1192+
1193+
py312-test-opamp-client-latest_ubuntu-latest:
1194+
name: opamp-client-latest 3.12 Ubuntu
1195+
runs-on: ubuntu-latest
1196+
timeout-minutes: 30
1197+
steps:
1198+
- name: Checkout repo @ SHA - ${{ github.sha }}
1199+
uses: actions/checkout@v4
1200+
1201+
- name: Set up Python 3.12
1202+
uses: actions/setup-python@v5
1203+
with:
1204+
python-version: "3.12"
1205+
1206+
- name: Install tox
1207+
run: pip install tox-uv
1208+
1209+
- name: Run tests
1210+
run: tox -e py312-test-opamp-client-latest -- -ra
11351211

1136-
py312-test-opamp-client_ubuntu-latest:
1137-
name: opamp-client 3.12 Ubuntu
1212+
py312-test-opamp-client-lowest_ubuntu-latest:
1213+
name: opamp-client-lowest 3.12 Ubuntu
11381214
runs-on: ubuntu-latest
11391215
timeout-minutes: 30
11401216
steps:
@@ -1150,10 +1226,29 @@ jobs:
11501226
run: pip install tox-uv
11511227

11521228
- name: Run tests
1153-
run: tox -e py312-test-opamp-client -- -ra
1229+
run: tox -e py312-test-opamp-client-lowest -- -ra
1230+
1231+
py313-test-opamp-client-latest_ubuntu-latest:
1232+
name: opamp-client-latest 3.13 Ubuntu
1233+
runs-on: ubuntu-latest
1234+
timeout-minutes: 30
1235+
steps:
1236+
- name: Checkout repo @ SHA - ${{ github.sha }}
1237+
uses: actions/checkout@v4
1238+
1239+
- name: Set up Python 3.13
1240+
uses: actions/setup-python@v5
1241+
with:
1242+
python-version: "3.13"
1243+
1244+
- name: Install tox
1245+
run: pip install tox-uv
1246+
1247+
- name: Run tests
1248+
run: tox -e py313-test-opamp-client-latest -- -ra
11541249

1155-
py313-test-opamp-client_ubuntu-latest:
1156-
name: opamp-client 3.13 Ubuntu
1250+
py313-test-opamp-client-lowest_ubuntu-latest:
1251+
name: opamp-client-lowest 3.13 Ubuntu
11571252
runs-on: ubuntu-latest
11581253
timeout-minutes: 30
11591254
steps:
@@ -1169,4 +1264,4 @@ jobs:
11691264
run: pip install tox-uv
11701265

11711266
- name: Run tests
1172-
run: tox -e py313-test-opamp-client -- -ra
1267+
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
@@ -424,7 +424,7 @@ envlist =
424424
lint-processor-baggage
425425

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

0 commit comments

Comments
 (0)