Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary dependencies pytest, flaky and pytest-benchmark #4022

Merged
merged 10 commits into from
Jul 4, 2024
Merged

Remove unnecessary dependencies pytest, flaky and pytest-benchmark #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
07b6a95
Remove unnecessary dependencies pytest and pytest-benchmark
ocelotl Jul 3, 2024
05784f8
Separate runs for CI
ocelotl Jul 3, 2024
feac4da
Remove unnecessary flaky dependency
ocelotl Jul 3, 2024
cca3f73
wPU
ocelotl Jul 3, 2024
98991b4
wer
ocelotl Jul 3, 2024
49baf80
wer
ocelotl Jul 3, 2024
c622007
Try without -c dev-requirements
ocelotl Jul 3, 2024
58a29f7
Try again for all packages
ocelotl Jul 3, 2024
eaf1620
Another attempt separating both runs
ocelotl Jul 3, 2024
1e1c6b4
Add mypy-requirements to keep mypy version
ocelotl Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,12 @@ jobs:
- name: Windows does not let git check out files with long names
if: ${{ matrix.os == 'windows-2019'}}
run: git config --system core.longpaths true
- name: run tox
- name: run pytest with --benchmark-skip
ocelotl marked this conversation as resolved.
Show resolved Hide resolved
if: ${{ matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc' }}
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
- name: run pytest without --benchmark-skip
if: ${{ !(matrix.package == 'sdk' || matrix.package == 'exporter-otlp-proto-grpc') }}
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
misc:
strategy:
fail-fast: false
Expand Down
1 change: 0 additions & 1 deletion dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ ruamel.yaml==0.17.21
asgiref==3.7.2
psutil==5.9.6
GitPython==3.1.41
flaky==3.7.0
pre-commit==3.7.0; python_version >= '3.9'
pre-commit==3.5.0; python_version < '3.9'
2 changes: 0 additions & 2 deletions docs/getting_started/tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ certifi==2023.7.22
charset-normalizer==2.0.12
click==8.1.7
Deprecated==1.2.14
flaky==3.7.0
Flask==2.3.3
idna==3.7
importlib-metadata==6.8.0
Expand All @@ -16,7 +15,6 @@ packaging==24.0
pluggy==1.3.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
requests==2.32.3
tomli==2.0.1
typing_extensions==4.8.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-opencensus/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
grpcio==1.62.0
importlib-metadata==6.11.0
iniconfig==2.0.0
Expand All @@ -10,7 +9,6 @@ pluggy==1.5.0
protobuf==3.20.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==3.20.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==4.25.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
1 change: 0 additions & 1 deletion exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
googleapis-common-protos==1.62.0
grpcio==1.62.0
importlib-metadata==6.11.0
Expand Down
1 change: 0 additions & 1 deletion exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
googleapis-common-protos==1.62.0
grpcio==1.62.0
importlib-metadata==6.11.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ asgiref==3.7.2
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
googleapis-common-protos==1.62.0
idna==3.7
importlib-metadata==6.11.0
Expand All @@ -12,7 +11,6 @@ pluggy==1.5.0
protobuf==3.20.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
PyYAML==6.0.1
requests==2.32.3
responses==0.24.1
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-otlp-proto-http/test-requirements-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ asgiref==3.7.2
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
googleapis-common-protos==1.62.0
idna==3.7
importlib-metadata==6.11.0
Expand All @@ -12,7 +11,6 @@ pluggy==1.5.0
protobuf==4.25.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
PyYAML==6.0.1
requests==2.32.3
responses==0.24.1
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-otlp/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-prometheus/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
prometheus_client==0.20.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-zipkin-json/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ asgiref==3.7.2
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
idna==3.7
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
requests==2.32.3
tomli==2.0.1
typing_extensions==4.10.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ asgiref==3.7.2
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
idna==3.7
importlib-metadata==6.11.0
iniconfig==2.0.0
Expand All @@ -11,7 +10,6 @@ pluggy==1.5.0
protobuf==3.20.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
requests==2.32.3
tomli==2.0.1
typing_extensions==4.10.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-zipkin/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
1 change: 1 addition & 0 deletions mypy-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mypy==1.9.0
2 changes: 0 additions & 2 deletions opentelemetry-api/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions opentelemetry-proto/test-requirements-0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==3.20.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions opentelemetry-proto/test-requirements-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==4.25.3
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions opentelemetry-semantic-conventions/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
1 change: 0 additions & 1 deletion propagator/opentelemetry-propagator-b3/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
Expand Down
2 changes: 0 additions & 2 deletions propagator/opentelemetry-propagator-jaeger/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions shim/opentelemetry-opencensus-shim/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ cachetools==5.3.3
certifi==2024.2.2
charset-normalizer==3.3.2
Deprecated==1.2.14
flaky==3.7.0
google-api-core==2.17.1
google-auth==2.28.1
googleapis-common-protos==1.62.0
Expand All @@ -21,7 +20,6 @@ py-cpuinfo==9.0.0
pyasn1==0.5.1
pyasn1-modules==0.3.0
pytest==7.4.4
pytest-benchmark==4.0.0
requests==2.32.3
rsa==4.9
six==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions shim/opentelemetry-opentracing-shim/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
opentracing==2.4.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
2 changes: 0 additions & 2 deletions tests/opentelemetry-test-utils/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
asgiref==3.7.2
Deprecated==1.2.14
flaky==3.7.0
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
py-cpuinfo==9.0.0
pytest==7.4.4
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
Expand Down
7 changes: 2 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,8 @@ envlist =

[testenv]
deps =
-c dev-requirements.txt
opentelemetry: pytest
opentelemetry: pytest-benchmark
opentelemetry: flaky
coverage: pytest
coverage: pytest-cov
mypy,mypyinstalled: mypy

; proto 3 and 4 tests install the respective version of protobuf
proto3: protobuf~=3.19.0
Expand All @@ -113,6 +108,8 @@ setenv =

commands_pre =

mypy,mypyinstalled: pip install -r {toxinidir}/mypy-requirements.txt

api: pip install -r {toxinidir}/opentelemetry-api/test-requirements.txt

sdk: pip install -r {toxinidir}/opentelemetry-sdk/test-requirements.txt
Expand Down