Skip to content

Commit 8e734b1

Browse files
xrmxxrmx
committed
Fix tox
1 parent 04d8923 commit 8e734b1

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
@@ -2933,8 +2933,8 @@ jobs:
29332933
- name: Run tests
29342934
run: tox -e py39-test-processor-baggage -- -ra
29352935

2936-
py39-test-opamp-client:
2937-
name: opamp-client
2936+
py39-test-opamp-client-latest:
2937+
name: opamp-client-latest
29382938
runs-on: ubuntu-latest
29392939
timeout-minutes: 30
29402940
steps:
@@ -2961,4 +2961,34 @@ jobs:
29612961
run: pip install tox-uv
29622962

29632963
- name: Run tests
2964-
run: tox -e py39-test-opamp-client -- -ra
2964+
run: tox -e py39-test-opamp-client-latest -- -ra
2965+
2966+
py39-test-opamp-client-lowest:
2967+
name: opamp-client-lowest
2968+
runs-on: ubuntu-latest
2969+
timeout-minutes: 30
2970+
steps:
2971+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
2972+
uses: actions/checkout@v4
2973+
with:
2974+
repository: open-telemetry/opentelemetry-python-contrib
2975+
ref: ${{ env.CONTRIB_REPO_SHA }}
2976+
2977+
- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
2978+
uses: actions/checkout@v4
2979+
with:
2980+
repository: open-telemetry/opentelemetry-python
2981+
ref: ${{ env.CORE_REPO_SHA }}
2982+
path: opentelemetry-python
2983+
2984+
- name: Set up Python 3.9
2985+
uses: actions/setup-python@v5
2986+
with:
2987+
python-version: "3.9"
2988+
architecture: "x64"
2989+
2990+
- name: Install tox
2991+
run: pip install tox-uv
2992+
2993+
- name: Run tests
2994+
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
@@ -962,8 +962,8 @@ jobs:
962962
- name: Run tests
963963
run: tox -e pypy3-test-processor-baggage -- -ra
964964

965-
py39-test-opamp-client_ubuntu-latest:
966-
name: opamp-client 3.9 Ubuntu
965+
py39-test-opamp-client-latest_ubuntu-latest:
966+
name: opamp-client-latest 3.9 Ubuntu
967967
runs-on: ubuntu-latest
968968
timeout-minutes: 30
969969
steps:
@@ -979,10 +979,48 @@ jobs:
979979
run: pip install tox-uv
980980

981981
- name: Run tests
982-
run: tox -e py39-test-opamp-client -- -ra
982+
run: tox -e py39-test-opamp-client-latest -- -ra
983983

984-
py310-test-opamp-client_ubuntu-latest:
985-
name: opamp-client 3.10 Ubuntu
984+
py39-test-opamp-client-lowest_ubuntu-latest:
985+
name: opamp-client-lowest 3.9 Ubuntu
986+
runs-on: ubuntu-latest
987+
timeout-minutes: 30
988+
steps:
989+
- name: Checkout repo @ SHA - ${{ github.sha }}
990+
uses: actions/checkout@v4
991+
992+
- name: Set up Python 3.9
993+
uses: actions/setup-python@v5
994+
with:
995+
python-version: "3.9"
996+
997+
- name: Install tox
998+
run: pip install tox-uv
999+
1000+
- name: Run tests
1001+
run: tox -e py39-test-opamp-client-lowest -- -ra
1002+
1003+
py310-test-opamp-client-latest_ubuntu-latest:
1004+
name: opamp-client-latest 3.10 Ubuntu
1005+
runs-on: ubuntu-latest
1006+
timeout-minutes: 30
1007+
steps:
1008+
- name: Checkout repo @ SHA - ${{ github.sha }}
1009+
uses: actions/checkout@v4
1010+
1011+
- name: Set up Python 3.10
1012+
uses: actions/setup-python@v5
1013+
with:
1014+
python-version: "3.10"
1015+
1016+
- name: Install tox
1017+
run: pip install tox-uv
1018+
1019+
- name: Run tests
1020+
run: tox -e py310-test-opamp-client-latest -- -ra
1021+
1022+
py310-test-opamp-client-lowest_ubuntu-latest:
1023+
name: opamp-client-lowest 3.10 Ubuntu
9861024
runs-on: ubuntu-latest
9871025
timeout-minutes: 30
9881026
steps:
@@ -998,10 +1036,29 @@ jobs:
9981036
run: pip install tox-uv
9991037

10001038
- name: Run tests
1001-
run: tox -e py310-test-opamp-client -- -ra
1039+
run: tox -e py310-test-opamp-client-lowest -- -ra
1040+
1041+
py311-test-opamp-client-latest_ubuntu-latest:
1042+
name: opamp-client-latest 3.11 Ubuntu
1043+
runs-on: ubuntu-latest
1044+
timeout-minutes: 30
1045+
steps:
1046+
- name: Checkout repo @ SHA - ${{ github.sha }}
1047+
uses: actions/checkout@v4
1048+
1049+
- name: Set up Python 3.11
1050+
uses: actions/setup-python@v5
1051+
with:
1052+
python-version: "3.11"
1053+
1054+
- name: Install tox
1055+
run: pip install tox-uv
1056+
1057+
- name: Run tests
1058+
run: tox -e py311-test-opamp-client-latest -- -ra
10021059

1003-
py311-test-opamp-client_ubuntu-latest:
1004-
name: opamp-client 3.11 Ubuntu
1060+
py311-test-opamp-client-lowest_ubuntu-latest:
1061+
name: opamp-client-lowest 3.11 Ubuntu
10051062
runs-on: ubuntu-latest
10061063
timeout-minutes: 30
10071064
steps:
@@ -1017,10 +1074,29 @@ jobs:
10171074
run: pip install tox-uv
10181075

10191076
- name: Run tests
1020-
run: tox -e py311-test-opamp-client -- -ra
1077+
run: tox -e py311-test-opamp-client-lowest -- -ra
1078+
1079+
py312-test-opamp-client-latest_ubuntu-latest:
1080+
name: opamp-client-latest 3.12 Ubuntu
1081+
runs-on: ubuntu-latest
1082+
timeout-minutes: 30
1083+
steps:
1084+
- name: Checkout repo @ SHA - ${{ github.sha }}
1085+
uses: actions/checkout@v4
1086+
1087+
- name: Set up Python 3.12
1088+
uses: actions/setup-python@v5
1089+
with:
1090+
python-version: "3.12"
1091+
1092+
- name: Install tox
1093+
run: pip install tox-uv
1094+
1095+
- name: Run tests
1096+
run: tox -e py312-test-opamp-client-latest -- -ra
10211097

1022-
py312-test-opamp-client_ubuntu-latest:
1023-
name: opamp-client 3.12 Ubuntu
1098+
py312-test-opamp-client-lowest_ubuntu-latest:
1099+
name: opamp-client-lowest 3.12 Ubuntu
10241100
runs-on: ubuntu-latest
10251101
timeout-minutes: 30
10261102
steps:
@@ -1036,10 +1112,29 @@ jobs:
10361112
run: pip install tox-uv
10371113

10381114
- name: Run tests
1039-
run: tox -e py312-test-opamp-client -- -ra
1115+
run: tox -e py312-test-opamp-client-lowest -- -ra
1116+
1117+
py313-test-opamp-client-latest_ubuntu-latest:
1118+
name: opamp-client-latest 3.13 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.13
1126+
uses: actions/setup-python@v5
1127+
with:
1128+
python-version: "3.13"
1129+
1130+
- name: Install tox
1131+
run: pip install tox-uv
1132+
1133+
- name: Run tests
1134+
run: tox -e py313-test-opamp-client-latest -- -ra
10401135

1041-
py313-test-opamp-client_ubuntu-latest:
1042-
name: opamp-client 3.13 Ubuntu
1136+
py313-test-opamp-client-lowest_ubuntu-latest:
1137+
name: opamp-client-lowest 3.13 Ubuntu
10431138
runs-on: ubuntu-latest
10441139
timeout-minutes: 30
10451140
steps:
@@ -1055,4 +1150,4 @@ jobs:
10551150
run: pip install tox-uv
10561151

10571152
- name: Run tests
1058-
run: tox -e py313-test-opamp-client -- -ra
1153+
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
@@ -419,7 +419,7 @@ envlist =
419419
lint-processor-baggage
420420

421421
; opentelemetry-opamp-client
422-
py3{9,10,11,12,13}-test-opamp-client
422+
py3{9,10,11,12,13}-test-opamp-client-{latest,lowest}
423423
; https://github.com/kevin1024/vcrpy/pull/775#issuecomment-1847849962
424424
; pypy3-test-opamp-client
425425
lint-opamp-client

0 commit comments

Comments
 (0)