@@ -8,6 +8,7 @@ envlist =
88 ; Environments are organized by individual package, allowing
99 ; for specifying supported Python versions per package.
1010
11+ <<<<<<< HEAD
1112 py3{9,10,11,12,13}-test-opentelemetry-api
1213 pypy3-test-opentelemetry-api
1314 lint-opentelemetry-api
@@ -23,6 +24,23 @@ envlist =
2324
2425 py3{9,10,11,12,13}-test-opentelemetry-semantic-conventions
2526 pypy3-test-opentelemetry-semantic-conventions
27+ =======
28+ py3{8,9,10,11,12,13}-test-opentelemetry-api
29+ pypy38-test-opentelemetry-api
30+ lint-opentelemetry-api
31+
32+ py3{8,9,10,11,12,13}-test-opentelemetry-proto-protobuf5
33+ pypy38-test-opentelemetry-proto-protobuf5
34+ lint-opentelemetry-proto-protobuf5
35+
36+ py3{8,9,10,11,12,13}-test-opentelemetry-sdk
37+ pypy38-test-opentelemetry-sdk
38+ lint-opentelemetry-sdk
39+ benchmark-opentelemetry-sdk
40+
41+ py3{8,9,10,11,12,13}-test-opentelemetry-semantic-conventions
42+ pypy38-test-opentelemetry-semantic-conventions
43+ >>>>>>> a66a495d (try pypy38)
2644 lint-opentelemetry-semantic-conventions
2745
2846 py3{9,10,11,12,13}-test-opentelemetry-getting-started
0 commit comments