Skip to content

Commit

Permalink
Merge pull request #550 from earthgecko/SNAB
Browse files Browse the repository at this point in the history
Disable opentelemetry packages due to conflicts
  • Loading branch information
earthgecko committed Apr 30, 2022
2 parents 3db3a8b + a8513e4 commit ae71989
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions docs/readthedocs.requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ matplotlib==3.5.1
#pandas==1.2.0
# @modified 20220422 - Task #4452: Update dependencies
#pandas==1.3.5
# @modified 20220430 - Task #4452: Update dependencies
# pandas 1.4.2 not available on readthedocs
#pandas==1.4.2
pandas==1.3.5
Expand Down Expand Up @@ -255,18 +256,20 @@ bottleneck==1.3.2
openpyxl==3.0.9

# @added 20220422 - Task #4452: Update dependencies
opentelemetry-api==1.11.1
opentelemetry-distro==0.29b0
opentelemetry-exporter-jaeger==1.11.1
opentelemetry-exporter-jaeger-proto-grpc==1.11.1
opentelemetry-exporter-jaeger-thrift==1.11.1
opentelemetry-instrumentation==0.29b0
opentelemetry-instrumentation-flask==0.29b1
opentelemetry-instrumentation-pymemcache==0.29b0
opentelemetry-instrumentation-redis==0.29b0
opentelemetry-instrumentation-sqlalchemy==0.29b0
opentelemetry-instrumentation-wsgi==0.29b0
opentelemetry-proto==1.11.1
opentelemetry-sdk==1.11.1
opentelemetry-semantic-conventions==0.29b0
opentelemetry-util-http==0.29b0
# @modified 20220430 - Task #4452: Update dependencies
# opentelemetry conflicts, disabling
#opentelemetry-api==1.11.1
#opentelemetry-distro==0.29b0
#opentelemetry-exporter-jaeger==1.11.1
#opentelemetry-exporter-jaeger-proto-grpc==1.11.1
#opentelemetry-exporter-jaeger-thrift==1.11.1
#opentelemetry-instrumentation==0.29b0
#opentelemetry-instrumentation-flask==0.29b1
#opentelemetry-instrumentation-redis==0.29b0
#opentelemetry-instrumentation-pymemcache==0.29b0
#opentelemetry-instrumentation-sqlalchemy==0.29b0
#opentelemetry-instrumentation-wsgi==0.29b0
#opentelemetry-proto==1.11.1
#opentelemetry-sdk==1.11.1
#opentelemetry-semantic-conventions==0.29b0
#opentelemetry-util-http==0.29b0

0 comments on commit ae71989

Please sign in to comment.