Skip to content

Commit d47c5be

Browse files
committed
remove unused test-requirements file and fix opencensus tests and remove unused dependencies from tox.ini
Signed-off-by: emdneto <[email protected]>
1 parent 87d33b3 commit d47c5be

File tree

10 files changed

+35
-203
lines changed

10 files changed

+35
-203
lines changed

.github/workflows/misc_0.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ jobs:
124124
- name: Run tests
125125
run: tox -e docs
126126

127-
docker-tests-proto:
128-
name: docker-tests-proto
127+
docker-tests-otlpexporter:
128+
name: docker-tests-otlpexporter
129129
runs-on: ubuntu-latest
130130
steps:
131131
- name: Checkout repo @ SHA - ${{ github.sha }}
@@ -140,7 +140,25 @@ jobs:
140140
run: pip install tox
141141

142142
- name: Run tests
143-
run: tox -e docker-tests-proto
143+
run: tox -e docker-tests-otlpexporter
144+
145+
docker-tests-opencensus:
146+
name: docker-tests-opencensus
147+
runs-on: ubuntu-latest
148+
steps:
149+
- name: Checkout repo @ SHA - ${{ github.sha }}
150+
uses: actions/checkout@v4
151+
152+
- name: Set up Python 3.10
153+
uses: actions/setup-python@v5
154+
with:
155+
python-version: "3.10"
156+
157+
- name: Install tox
158+
run: pip install tox
159+
160+
- name: Run tests
161+
run: tox -e docker-tests-opencensus
144162

145163
public-symbols-check:
146164
name: public-symbols-check

exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt

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

exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt

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

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

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

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

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

exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt

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

exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt

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

opentelemetry-proto/test-requirements-0.txt

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

opentelemetry-proto/test-requirements-1.txt

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

tox.ini

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ envlist =
1010
pypy3-test-opentelemetry-api
1111
lint-opentelemetry-api
1212

13-
; The numbers at the end of the environment names
14-
; below mean these dependencies are being used:
15-
; 0: protobuf==3.20.3
16-
; 1: protobuf==4.25.3
1713
py3{8,9,10,11,12}-test-opentelemetry-proto-protobuf5
1814
pypy3-test-opentelemetry-proto-protobuf5
1915
lint-opentelemetry-proto-protobuf5
@@ -42,10 +38,6 @@ envlist =
4238
; exporter-opencensus intentionally excluded from pypy3
4339
lint-opentelemetry-exporter-opencensus
4440

45-
; The numbers at the end of the environment names
46-
; below mean these dependencies are being used:
47-
; 0: protobuf==3.20.3
48-
; 1: protobuf==4.25.3
4941
py3{8,9,10,11,12}-test-opentelemetry-exporter-otlp-proto-common
5042
pypy3-test-opentelemetry-exporter-otlp-proto-common
5143
lint-opentelemetry-exporter-otlp-proto-common
@@ -55,19 +47,11 @@ envlist =
5547
; intentionally excluded from pypy3
5648
lint-opentelemetry-exporter-otlp-combined
5749

58-
; The numbers at the end of the environment names
59-
; below mean these dependencies are being used:
60-
; 0: protobuf==3.20.3
61-
; 1: protobuf==4.25.3
6250
py3{8,9,10,11,12}-test-opentelemetry-exporter-otlp-proto-grpc
6351
; intentionally excluded from pypy3
6452
lint-opentelemetry-exporter-otlp-proto-grpc
6553
benchmark-opentelemetry-exporter-otlp-proto-grpc
6654

67-
; The numbers at the end of the environment names
68-
; below mean these dependencies are being used:
69-
; 0: protobuf==3.20.3
70-
; 1: protobuf==4.25.3
7155
py3{8,9,10,11,12}-test-opentelemetry-exporter-otlp-proto-http
7256
pypy3-test-opentelemetry-exporter-otlp-proto-http
7357
lint-opentelemetry-exporter-otlp-proto-http
@@ -107,7 +91,7 @@ envlist =
10791
mypy,mypyinstalled
10892
pyright
10993
docs
110-
docker-tests-proto
94+
docker-tests-{otlpexporter,opencensus}
11195
public-symbols-check
11296
shellcheck
11397
generate-workflows
@@ -117,10 +101,6 @@ deps =
117101
lint: -r dev-requirements.txt
118102
coverage: pytest
119103
coverage: pytest-cov
120-
; proto 3 and 4 tests install the respective version of protobuf
121-
; proto3: protobuf~=3.19.0
122-
; proto4: protobuf~=4.0
123-
; proto5: protobuf~=5.26.0
124104

125105
allowlist_externals = sh
126106

@@ -381,7 +361,7 @@ commands_pre =
381361
commands =
382362
{toxinidir}/scripts/tracecontext-integration-test.sh
383363

384-
[testenv:docker-tests-proto]
364+
[testenv:docker-tests-{otlpexporter,opencensus}]
385365
deps =
386366
pytest==7.1.3
387367
# Pinning PyYAML for issue: https://github.com/yaml/pyyaml/issues/724
@@ -391,9 +371,6 @@ deps =
391371
docker-compose==1.29.2
392372
requests==2.28.2
393373

394-
; proto 3 and 4 tests install the respective version of protobuf
395-
proto: protobuf~=5.26.0
396-
397374
changedir =
398375
tests/opentelemetry-docker-tests/tests
399376

@@ -402,17 +379,20 @@ commands_pre =
402379
pip install -e {toxinidir}/opentelemetry-api \
403380
-e {toxinidir}/opentelemetry-semantic-conventions \
404381
-e {toxinidir}/opentelemetry-sdk \
405-
-e {toxinidir}/tests/opentelemetry-test-utils \
406-
; opencensus exporter does not work with protobuf 4+
407-
proto: -e {toxinidir}/opentelemetry-proto \
408-
-e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common \
409-
-e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc \
410-
-e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http \
411-
-e {toxinidir}/exporter/opentelemetry-exporter-otlp
382+
-e {toxinidir}/tests/opentelemetry-test-utils
383+
384+
otlpexporter: pip install -e {toxinidir}/opentelemetry-proto
385+
otlpexporter: pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common
386+
otlpexporter: pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc
387+
otlpexporter: pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http
388+
otlpexporter: pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp
389+
390+
opencensus: pip install -e {toxinidir}/exporter/opentelemetry-exporter-opencensus
391+
412392
docker-compose up -d
413393
commands =
414-
; opencensus exporter does not work with protobuf 4+
415-
proto: pytest --ignore opencensus {posargs}
394+
otlpexporter: pytest otlpexporter {posargs}
395+
opencensus: pytest opencensus {posargs}
416396

417397
commands_post =
418398
docker-compose down -v

0 commit comments

Comments
 (0)