Skip to content

Commit

Permalink
Fix several dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ocelotl committed Apr 3, 2024
1 parent 5ff9046 commit 877fb97
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 35 deletions.
3 changes: 1 addition & 2 deletions docs-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ sphinx-jekyll-builder==0.3.0

# Need to install the api/sdk in the venv for autodoc. Modifying sys.path
# doesn't work for pkg_resources.
./opentelemetry-api
./opentelemetry-semantic-conventions
./opentelemetry-sdk
./shim/opentelemetry-opencensus-shim
Expand All @@ -24,4 +23,4 @@ markupsafe~=2.0

# Jaeger generated protobufs do not currently support protobuf 4.x. This can be removed once
# they're regenerated.
protobuf~=3.19
protobuf==3.19
2 changes: 1 addition & 1 deletion docs/examples/error_handler/error_handler_0/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-sdk ~= 1.3",
"opentelemetry-sdk==1.3",
]

[project.entry-points.opentelemetry_error_handler]
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/error_handler/error_handler_1/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-sdk ~= 1.3",
"opentelemetry-sdk==1.3",
]

[project.entry-points.opentelemetry_error_handler]
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/metrics/prometheus-grafana/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
opentelemetry-exporter-prometheus==1.12.0rc1
protobuf~=3.18.1
protobuf==3.18.1
2 changes: 1 addition & 1 deletion docs/examples/metrics/reader/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Deprecated==1.2.13
opentelemetry-api==1.15.0
opentelemetry-api==1.20.0
opentelemetry-sdk==1.15.0
opentelemetry-semantic-conventions==0.36b0
typing_extensions==4.3.0
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/metrics/views/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Deprecated==1.2.13
opentelemetry-api==1.12.0
opentelemetry-api==1.20.0
opentelemetry-sdk==1.12.0
opentelemetry-semantic-conventions==0.33b0
typing_extensions==4.3.0
Expand Down
8 changes: 0 additions & 8 deletions docs/examples/opencensus-shim/requirements.txt

This file was deleted.

6 changes: 0 additions & 6 deletions docs/examples/opentracing/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-opencensus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opencensus-proto >= 0.1.0, < 1.0.0",
"opentelemetry-api >= 1.25.0.dev",
"opentelemetry-sdk >= 1.15",
"protobuf ~= 3.13",
"protobuf==3.13",
"setuptools >= 16.0",
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ classifiers = [
]
dependencies = [
"Deprecated >= 1.2.6",
"googleapis-common-protos ~= 1.52",
"googleapis-common-protos==1.52",
"grpcio >= 1.0.0, < 2.0.0",
"opentelemetry-api ~= 1.15",
"opentelemetry-proto == 1.25.0.dev",
"opentelemetry-sdk ~= 1.25.0.dev",
"opentelemetry-sdk==1.25.0.dev",
"opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ classifiers = [
]
dependencies = [
"Deprecated >= 1.2.6",
"googleapis-common-protos ~= 1.52",
"googleapis-common-protos==1.52",
"opentelemetry-api ~= 1.15",
"opentelemetry-proto == 1.25.0.dev",
"opentelemetry-sdk ~= 1.25.0.dev",
"opentelemetry-sdk==1.25.0.dev",
"opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
"requests ~= 2.7",
"requests==2.7",
]

[project.entry-points.opentelemetry_traces_exporter]
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-prometheus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
dependencies = [
"opentelemetry-api ~= 1.12",
# DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release
"opentelemetry-sdk ~= 1.25.0.dev",
"opentelemetry-sdk==1.25.0.dev",
"prometheus_client >= 0.5.0, < 1.0.0",
]

Expand Down
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-zipkin-json/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ classifiers = [
]
dependencies = [
"opentelemetry-api ~= 1.3",
"opentelemetry-sdk ~= 1.11",
"requests ~= 2.7",
"opentelemetry-sdk==1.11",
"requests==2.7",
]

[project.entry-points.opentelemetry_traces_exporter]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ classifiers = [
dependencies = [
"opentelemetry-api ~= 1.3",
"opentelemetry-exporter-zipkin-json == 1.25.0.dev",
"opentelemetry-sdk ~= 1.11",
"protobuf ~= 3.12",
"requests ~= 2.7",
"opentelemetry-sdk==1.11",
"protobuf==3.12",
"requests==2.7",
]

[project.entry-points.opentelemetry_traces_exporter]
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-proto/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
dependencies = [
"protobuf>=3.19, < 5.0",
"protobuf==3.19",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion tests/opentelemetry-test-utils/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.10",
]
dependencies = [
"asgiref ~= 3.0",
"asgiref == 3.0",
"opentelemetry-api == 1.25.0.dev",
"opentelemetry-sdk == 1.25.0.dev",
]
Expand Down

0 comments on commit 877fb97

Please sign in to comment.