Skip to content

Commit cd66dc4

Browse files
joshowenjoshowen
committed
update tox
1 parent f853a1a commit cd66dc4

File tree

4 files changed

+242
-108
lines changed

4 files changed

+242
-108
lines changed

‎.github/workflows/core_contrib_test_0.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,28 @@ jobs:
10531053
- name: Run tests
10541054
run: tox -e py38-test-instrumentation-psycopg2 -- -ra
10551055

1056+
py38-test-instrumentation-psycopg2-binary:
1057+
name: instrumentation-psycopg2-binary
1058+
runs-on: ubuntu-latest
1059+
steps:
1060+
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
1061+
uses: actions/checkout@v4
1062+
with:
1063+
repository: open-telemetry/opentelemetry-python-contrib
1064+
ref: ${{ env.CONTRIB_REPO_SHA }}
1065+
1066+
- name: Set up Python 3.8
1067+
uses: actions/setup-python@v5
1068+
with:
1069+
python-version: "3.8"
1070+
architecture: "x64"
1071+
1072+
- name: Install tox
1073+
run: pip install tox
1074+
1075+
- name: Run tests
1076+
run: tox -e py38-test-instrumentation-psycopg2-binary -- -ra
1077+
10561078
py38-test-instrumentation-psycopg:
10571079
name: instrumentation-psycopg
10581080
runs-on: ubuntu-latest

‎.github/workflows/test_1.yml

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,6 +1114,114 @@ jobs:
11141114
- name: Run tests
11151115
run: tox -e py313-test-instrumentation-psycopg2 -- -ra
11161116

1117+
py38-test-instrumentation-psycopg2-binary_ubuntu-latest:
1118+
name: instrumentation-psycopg2-binary 3.8 Ubuntu
1119+
runs-on: ubuntu-latest
1120+
steps:
1121+
- name: Checkout repo @ SHA - ${{ github.sha }}
1122+
uses: actions/checkout@v4
1123+
1124+
- name: Set up Python 3.8
1125+
uses: actions/setup-python@v5
1126+
with:
1127+
python-version: "3.8"
1128+
1129+
- name: Install tox
1130+
run: pip install tox
1131+
1132+
- name: Run tests
1133+
run: tox -e py38-test-instrumentation-psycopg2-binary -- -ra
1134+
1135+
py39-test-instrumentation-psycopg2-binary_ubuntu-latest:
1136+
name: instrumentation-psycopg2-binary 3.9 Ubuntu
1137+
runs-on: ubuntu-latest
1138+
steps:
1139+
- name: Checkout repo @ SHA - ${{ github.sha }}
1140+
uses: actions/checkout@v4
1141+
1142+
- name: Set up Python 3.9
1143+
uses: actions/setup-python@v5
1144+
with:
1145+
python-version: "3.9"
1146+
1147+
- name: Install tox
1148+
run: pip install tox
1149+
1150+
- name: Run tests
1151+
run: tox -e py39-test-instrumentation-psycopg2-binary -- -ra
1152+
1153+
py310-test-instrumentation-psycopg2-binary_ubuntu-latest:
1154+
name: instrumentation-psycopg2-binary 3.10 Ubuntu
1155+
runs-on: ubuntu-latest
1156+
steps:
1157+
- name: Checkout repo @ SHA - ${{ github.sha }}
1158+
uses: actions/checkout@v4
1159+
1160+
- name: Set up Python 3.10
1161+
uses: actions/setup-python@v5
1162+
with:
1163+
python-version: "3.10"
1164+
1165+
- name: Install tox
1166+
run: pip install tox
1167+
1168+
- name: Run tests
1169+
run: tox -e py310-test-instrumentation-psycopg2-binary -- -ra
1170+
1171+
py311-test-instrumentation-psycopg2-binary_ubuntu-latest:
1172+
name: instrumentation-psycopg2-binary 3.11 Ubuntu
1173+
runs-on: ubuntu-latest
1174+
steps:
1175+
- name: Checkout repo @ SHA - ${{ github.sha }}
1176+
uses: actions/checkout@v4
1177+
1178+
- name: Set up Python 3.11
1179+
uses: actions/setup-python@v5
1180+
with:
1181+
python-version: "3.11"
1182+
1183+
- name: Install tox
1184+
run: pip install tox
1185+
1186+
- name: Run tests
1187+
run: tox -e py311-test-instrumentation-psycopg2-binary -- -ra
1188+
1189+
py312-test-instrumentation-psycopg2-binary_ubuntu-latest:
1190+
name: instrumentation-psycopg2-binary 3.12 Ubuntu
1191+
runs-on: ubuntu-latest
1192+
steps:
1193+
- name: Checkout repo @ SHA - ${{ github.sha }}
1194+
uses: actions/checkout@v4
1195+
1196+
- name: Set up Python 3.12
1197+
uses: actions/setup-python@v5
1198+
with:
1199+
python-version: "3.12"
1200+
1201+
- name: Install tox
1202+
run: pip install tox
1203+
1204+
- name: Run tests
1205+
run: tox -e py312-test-instrumentation-psycopg2-binary -- -ra
1206+
1207+
py313-test-instrumentation-psycopg2-binary_ubuntu-latest:
1208+
name: instrumentation-psycopg2-binary 3.13 Ubuntu
1209+
runs-on: ubuntu-latest
1210+
steps:
1211+
- name: Checkout repo @ SHA - ${{ github.sha }}
1212+
uses: actions/checkout@v4
1213+
1214+
- name: Set up Python 3.13
1215+
uses: actions/setup-python@v5
1216+
with:
1217+
python-version: "3.13"
1218+
1219+
- name: Install tox
1220+
run: pip install tox
1221+
1222+
- name: Run tests
1223+
run: tox -e py313-test-instrumentation-psycopg2-binary -- -ra
1224+
11171225
py38-test-instrumentation-psycopg_ubuntu-latest:
11181226
name: instrumentation-psycopg 3.8 Ubuntu
11191227
runs-on: ubuntu-latest
@@ -4407,111 +4515,3 @@ jobs:
44074515

44084516
- name: Run tests
44094517
run: tox -e pypy3-test-util-http -- -ra
4410-
4411-
py38-test-propagator-aws-xray-0_ubuntu-latest:
4412-
name: propagator-aws-xray-0 3.8 Ubuntu
4413-
runs-on: ubuntu-latest
4414-
steps:
4415-
- name: Checkout repo @ SHA - ${{ github.sha }}
4416-
uses: actions/checkout@v4
4417-
4418-
- name: Set up Python 3.8
4419-
uses: actions/setup-python@v5
4420-
with:
4421-
python-version: "3.8"
4422-
4423-
- name: Install tox
4424-
run: pip install tox
4425-
4426-
- name: Run tests
4427-
run: tox -e py38-test-propagator-aws-xray-0 -- -ra
4428-
4429-
py38-test-propagator-aws-xray-1_ubuntu-latest:
4430-
name: propagator-aws-xray-1 3.8 Ubuntu
4431-
runs-on: ubuntu-latest
4432-
steps:
4433-
- name: Checkout repo @ SHA - ${{ github.sha }}
4434-
uses: actions/checkout@v4
4435-
4436-
- name: Set up Python 3.8
4437-
uses: actions/setup-python@v5
4438-
with:
4439-
python-version: "3.8"
4440-
4441-
- name: Install tox
4442-
run: pip install tox
4443-
4444-
- name: Run tests
4445-
run: tox -e py38-test-propagator-aws-xray-1 -- -ra
4446-
4447-
py39-test-propagator-aws-xray-0_ubuntu-latest:
4448-
name: propagator-aws-xray-0 3.9 Ubuntu
4449-
runs-on: ubuntu-latest
4450-
steps:
4451-
- name: Checkout repo @ SHA - ${{ github.sha }}
4452-
uses: actions/checkout@v4
4453-
4454-
- name: Set up Python 3.9
4455-
uses: actions/setup-python@v5
4456-
with:
4457-
python-version: "3.9"
4458-
4459-
- name: Install tox
4460-
run: pip install tox
4461-
4462-
- name: Run tests
4463-
run: tox -e py39-test-propagator-aws-xray-0 -- -ra
4464-
4465-
py39-test-propagator-aws-xray-1_ubuntu-latest:
4466-
name: propagator-aws-xray-1 3.9 Ubuntu
4467-
runs-on: ubuntu-latest
4468-
steps:
4469-
- name: Checkout repo @ SHA - ${{ github.sha }}
4470-
uses: actions/checkout@v4
4471-
4472-
- name: Set up Python 3.9
4473-
uses: actions/setup-python@v5
4474-
with:
4475-
python-version: "3.9"
4476-
4477-
- name: Install tox
4478-
run: pip install tox
4479-
4480-
- name: Run tests
4481-
run: tox -e py39-test-propagator-aws-xray-1 -- -ra
4482-
4483-
py310-test-propagator-aws-xray-0_ubuntu-latest:
4484-
name: propagator-aws-xray-0 3.10 Ubuntu
4485-
runs-on: ubuntu-latest
4486-
steps:
4487-
- name: Checkout repo @ SHA - ${{ github.sha }}
4488-
uses: actions/checkout@v4
4489-
4490-
- name: Set up Python 3.10
4491-
uses: actions/setup-python@v5
4492-
with:
4493-
python-version: "3.10"
4494-
4495-
- name: Install tox
4496-
run: pip install tox
4497-
4498-
- name: Run tests
4499-
run: tox -e py310-test-propagator-aws-xray-0 -- -ra
4500-
4501-
py310-test-propagator-aws-xray-1_ubuntu-latest:
4502-
name: propagator-aws-xray-1 3.10 Ubuntu
4503-
runs-on: ubuntu-latest
4504-
steps:
4505-
- name: Checkout repo @ SHA - ${{ github.sha }}
4506-
uses: actions/checkout@v4
4507-
4508-
- name: Set up Python 3.10
4509-
uses: actions/setup-python@v5
4510-
with:
4511-
python-version: "3.10"
4512-
4513-
- name: Install tox
4514-
run: pip install tox
4515-
4516-
- name: Run tests
4517-
run: tox -e py310-test-propagator-aws-xray-1 -- -ra

‎.github/workflows/test_2.yml

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,114 @@ env:
1616

1717
jobs:
1818

19+
py38-test-propagator-aws-xray-0_ubuntu-latest:
20+
name: propagator-aws-xray-0 3.8 Ubuntu
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout repo @ SHA - ${{ github.sha }}
24+
uses: actions/checkout@v4
25+
26+
- name: Set up Python 3.8
27+
uses: actions/setup-python@v5
28+
with:
29+
python-version: "3.8"
30+
31+
- name: Install tox
32+
run: pip install tox
33+
34+
- name: Run tests
35+
run: tox -e py38-test-propagator-aws-xray-0 -- -ra
36+
37+
py38-test-propagator-aws-xray-1_ubuntu-latest:
38+
name: propagator-aws-xray-1 3.8 Ubuntu
39+
runs-on: ubuntu-latest
40+
steps:
41+
- name: Checkout repo @ SHA - ${{ github.sha }}
42+
uses: actions/checkout@v4
43+
44+
- name: Set up Python 3.8
45+
uses: actions/setup-python@v5
46+
with:
47+
python-version: "3.8"
48+
49+
- name: Install tox
50+
run: pip install tox
51+
52+
- name: Run tests
53+
run: tox -e py38-test-propagator-aws-xray-1 -- -ra
54+
55+
py39-test-propagator-aws-xray-0_ubuntu-latest:
56+
name: propagator-aws-xray-0 3.9 Ubuntu
57+
runs-on: ubuntu-latest
58+
steps:
59+
- name: Checkout repo @ SHA - ${{ github.sha }}
60+
uses: actions/checkout@v4
61+
62+
- name: Set up Python 3.9
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: "3.9"
66+
67+
- name: Install tox
68+
run: pip install tox
69+
70+
- name: Run tests
71+
run: tox -e py39-test-propagator-aws-xray-0 -- -ra
72+
73+
py39-test-propagator-aws-xray-1_ubuntu-latest:
74+
name: propagator-aws-xray-1 3.9 Ubuntu
75+
runs-on: ubuntu-latest
76+
steps:
77+
- name: Checkout repo @ SHA - ${{ github.sha }}
78+
uses: actions/checkout@v4
79+
80+
- name: Set up Python 3.9
81+
uses: actions/setup-python@v5
82+
with:
83+
python-version: "3.9"
84+
85+
- name: Install tox
86+
run: pip install tox
87+
88+
- name: Run tests
89+
run: tox -e py39-test-propagator-aws-xray-1 -- -ra
90+
91+
py310-test-propagator-aws-xray-0_ubuntu-latest:
92+
name: propagator-aws-xray-0 3.10 Ubuntu
93+
runs-on: ubuntu-latest
94+
steps:
95+
- name: Checkout repo @ SHA - ${{ github.sha }}
96+
uses: actions/checkout@v4
97+
98+
- name: Set up Python 3.10
99+
uses: actions/setup-python@v5
100+
with:
101+
python-version: "3.10"
102+
103+
- name: Install tox
104+
run: pip install tox
105+
106+
- name: Run tests
107+
run: tox -e py310-test-propagator-aws-xray-0 -- -ra
108+
109+
py310-test-propagator-aws-xray-1_ubuntu-latest:
110+
name: propagator-aws-xray-1 3.10 Ubuntu
111+
runs-on: ubuntu-latest
112+
steps:
113+
- name: Checkout repo @ SHA - ${{ github.sha }}
114+
uses: actions/checkout@v4
115+
116+
- name: Set up Python 3.10
117+
uses: actions/setup-python@v5
118+
with:
119+
python-version: "3.10"
120+
121+
- name: Install tox
122+
run: pip install tox
123+
124+
- name: Run tests
125+
run: tox -e py310-test-propagator-aws-xray-1 -- -ra
126+
19127
py311-test-propagator-aws-xray-0_ubuntu-latest:
20128
name: propagator-aws-xray-0 3.11 Ubuntu
21129
runs-on: ubuntu-latest

‎tox.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ envlist =
210210

211211
; opentelemetry-instrumentation-psycopg2
212212
py3{8,9,10,11,12,13}-test-instrumentation-psycopg2
213+
py3{8,9,10,11,12,13}-test-instrumentation-psycopg2-binary
213214
; ext-psycopg2 intentionally excluded from pypy3
214215
lint-instrumentation-psycopg2
215216

@@ -805,6 +806,9 @@ commands =
805806
test-instrumentation-psycopg2: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/tests {posargs}
806807
lint-instrumentation-psycopg2: sh -c "cd instrumentation && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-psycopg2"
807808

809+
; Test only for psycopg2-binary instrumentation as the only difference between psycopg2 and psycopg2-binary is the install method
810+
test-instrumentation-psycopg2-binary: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/tests {posargs}
811+
808812
test-instrumentation-pymemcache: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/tests {posargs}
809813
lint-instrumentation-pymemcache: sh -c "cd instrumentation && pylint --rcfile ../.pylintrc opentelemetry-instrumentation-pymemcache"
810814

0 commit comments

Comments
 (0)