Skip to content

Commit 4cf1bf5

Browse files
committed
Update contrib sha and tox.ini
1 parent 38ca88e commit 4cf1bf5

3 files changed

Lines changed: 2 additions & 9 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: 73c67be0741b49fcd49ab8544dd6614b5dd813f4
13+
CONTRIB_REPO_SHA: ef05e54a3c188b9d313f74ec2196ba3337e6cbed
1414

1515
jobs:
1616
build:

docs-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ sphinx-jekyll-builder
1414
# Required by instrumentation and exporter packages
1515
asgiref~=3.0
1616
asyncpg>=0.12.0
17-
requests ~= 2.0
1817
ddtrace>=0.34.0
1918
aiohttp~= 3.0
2019
aiopg>=0.13.0

tox.ini

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,38 +128,32 @@ commands_pre =
128128

129129
getting-started: pip install requests flask -e {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-requests {toxinidir}/opentelemetry-python-contrib/util/opentelemetry-util-http -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-wsgi -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-flask
130130

131-
opencensus: pip install {toxinidir}/exporter/opentelemetry-exporter-opencensus {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
131+
opencensus: pip install {toxinidir}/exporter/opentelemetry-exporter-opencensus
132132

133133
exporter-otlp-combined: pip install {toxinidir}/opentelemetry-proto
134134
exporter-otlp-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc
135135
exporter-otlp-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp
136-
exporter-otlp-combined: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
137136

138137
exporter-otlp-proto-grpc: pip install {toxinidir}/opentelemetry-proto
139138
exporter-otlp-proto-grpc: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc
140-
exporter-otlp-proto-grpc: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
141139

142140
exporter-jaeger-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger-proto-grpc {toxinidir}/exporter/opentelemetry-exporter-jaeger-thrift {toxinidir}/exporter/opentelemetry-exporter-jaeger
143141
exporter-jaeger-combined: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
144142
exporter-jaeger-proto-grpc: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger-proto-grpc
145143
exporter-jaeger-proto-grpc: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
146144
exporter-jaeger-thrift: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger-thrift
147-
exporter-jaeger-thrift: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
148145

149146
opentracing-shim: pip install {toxinidir}/opentelemetry-sdk
150147
opentracing-shim: pip install {toxinidir}/shim/opentelemetry-opentracing-shim
151148

152149
exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-json
153150
exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http
154151
exporter-zipkin-combined: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin
155-
exporter-zipkin-combined: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
156152

157153
exporter-zipkin-proto-http: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-json
158154
exporter-zipkin-proto-http: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-proto-http
159-
exporter-zipkin-proto-http: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
160155

161156
exporter-zipkin-json: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin-json
162-
exporter-zipkin-json: pip install {toxinidir}/opentelemetry-python-contrib/opentelemetry-instrumentation
163157

164158
b3: pip install {toxinidir}/propagator/opentelemetry-propagator-b3
165159

0 commit comments

Comments
 (0)