Skip to content

Commit 82a4274

Browse files
committed
Cleanup tox issues and old requirements files
1 parent 6523761 commit 82a4274

File tree

4 files changed

+12
-46
lines changed

4 files changed

+12
-46
lines changed

.github/workflows/lint_0.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
- name: Run tests
4848
run: tox -e lint-opentelemetry-api
4949

50-
lint-opentelemetry-proto-oldest:
51-
name: opentelemetry-proto-oldest
50+
lint-opentelemetry-proto-gen-latest:
51+
name: opentelemetry-proto-gen-latest
5252
runs-on: ubuntu-latest
5353
timeout-minutes: 30
5454
steps:
@@ -64,7 +64,7 @@ jobs:
6464
run: pip install tox
6565

6666
- name: Run tests
67-
run: tox -e lint-opentelemetry-proto-oldest
67+
run: tox -e lint-opentelemetry-proto-gen-latest
6868

6969
lint-opentelemetry-sdk:
7070
name: opentelemetry-sdk
@@ -218,8 +218,8 @@ jobs:
218218
- name: Run tests
219219
run: tox -e lint-opentelemetry-exporter-otlp-combined
220220

221-
lint-opentelemetry-exporter-otlp-proto-grpc:
222-
name: opentelemetry-exporter-otlp-proto-grpc
221+
lint-opentelemetry-exporter-otlp-proto-grpc-latest:
222+
name: opentelemetry-exporter-otlp-proto-grpc-latest
223223
runs-on: ubuntu-latest
224224
timeout-minutes: 30
225225
steps:
@@ -235,7 +235,7 @@ jobs:
235235
run: pip install tox
236236

237237
- name: Run tests
238-
run: tox -e lint-opentelemetry-exporter-otlp-proto-grpc
238+
run: tox -e lint-opentelemetry-exporter-otlp-proto-grpc-latest
239239

240240
lint-opentelemetry-exporter-otlp-proto-http:
241241
name: opentelemetry-exporter-otlp-proto-http

exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

opentelemetry-proto/test-requirements.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

tox.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ envlist =
1212

1313
py3{9,10,11,12,13}-test-opentelemetry-proto-gen-{oldest,latest}
1414
pypy3-test-opentelemetry-proto-gen-{oldest,latest}
15-
lint-opentelemetry-proto-oldest
15+
lint-opentelemetry-proto-gen-latest
1616

1717
py3{9,10,11,12,13}-test-opentelemetry-sdk
1818
pypy3-test-opentelemetry-sdk
@@ -49,8 +49,8 @@ envlist =
4949

5050
py3{9,10,11,12,13}-test-opentelemetry-exporter-otlp-proto-grpc-{oldest,latest}
5151
; intentionally excluded from pypy3
52-
lint-opentelemetry-exporter-otlp-proto-grpc
53-
benchmark-opentelemetry-exporter-otlp-proto-grpc
52+
lint-opentelemetry-exporter-otlp-proto-grpc-latest
53+
benchmark-opentelemetry-exporter-otlp-proto-grpc-latest
5454

5555
py3{9,10,11,12,13}-test-opentelemetry-exporter-otlp-proto-http
5656
pypy3-test-opentelemetry-exporter-otlp-proto-http
@@ -171,8 +171,8 @@ commands =
171171
lint-opentelemetry-sdk: pylint {toxinidir}/opentelemetry-sdk
172172
benchmark-opentelemetry-sdk: pytest {toxinidir}/opentelemetry-sdk/benchmarks --benchmark-json={toxinidir}/opentelemetry-sdk/sdk-benchmark.json {posargs}
173173

174-
test-opentelemetry-proto: pytest {toxinidir}/opentelemetry-proto/tests {posargs}
175-
lint-opentelemetry-proto: pylint {toxinidir}/opentelemetry-proto
174+
test-opentelemetry-proto-gen: pytest {toxinidir}/opentelemetry-proto/tests {posargs}
175+
lint-opentelemetry-proto-gen: pylint {toxinidir}/opentelemetry-proto
176176

177177
test-opentelemetry-semantic-conventions: pytest {toxinidir}/opentelemetry-semantic-conventions/tests {posargs}
178178
lint-opentelemetry-semantic-conventions: pylint {toxinidir}/opentelemetry-semantic-conventions
@@ -208,7 +208,7 @@ commands =
208208
test-opentelemetry-exporter-zipkin-combined: pytest {toxinidir}/exporter/opentelemetry-exporter-zipkin/tests {posargs}
209209
lint-opentelemetry-exporter-zipkin-combined: sh -c "cd exporter && pylint --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-zipkin"
210210

211-
test-opentelemetry-exporter-zipkin-proto-http: pytest {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/tests {posargs}
211+
test-opentelemetry-zipkin-proto-http: pytest {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http/tests {posargs}
212212
lint-opentelemetry-exporter-zipkin-proto-http: sh -c "cd exporter && pylint --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http"
213213

214214
test-opentelemetry-exporter-zipkin-json: pytest {toxinidir}/exporter/opentelemetry-exporter-zipkin-json/tests {posargs}

0 commit comments

Comments
 (0)