test

open-telemetry · Jul 10, 2024 · a8f33db · a8f33db
1 parent 0c5ebd0
commit a8f33db
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/tox.ini b/tox.ini
@@ -595,17 +595,8 @@ commands_pre =
   httpx-1: uv pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
   lint-instrumentation-httpx: uv pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
 
-<<<<<<< HEAD
-  sdk-extension-aws: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  sdk-extension-aws: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  sdk-extension-aws: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  sdk-extension-aws: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  sdk-extension-aws: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
-  benchmark-sdk-extension-aws: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/benchmark-requirements.txt
-=======
   sdk-extension-aws: uv pip install {[testenv:base]core} {[testenv:base]utils}
   sdk-extension-aws: uv pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
->>>>>>> 01d734cd (update all packages)
 
   resource-detector-container: uv pip install {[testenv:base]core} {[testenv:base]utils}
   resource-detector-container: uv pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
@@ -616,17 +607,8 @@ commands_pre =
   propagator-ot-trace: uv pip install {[testenv:base]core} {[testenv:base]utils}
   propagator-ot-trace: uv pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
 
-<<<<<<< HEAD
-  propagator-aws-xray: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  propagator-aws-xray: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  propagator-aws-xray: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  propagator-aws-xray: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  propagator-aws-xray: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
-  benchmark-propagator-aws-xray: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/benchmark-requirements.txt
-=======
   propagator-aws-xray: uv pip install {[testenv:base]core} {[testenv:base]utils}
   propagator-aws-xray: uv pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
->>>>>>> 01d734cd (update all packages)
 
   processor-baggage: uv pip install {[testenv:base]core}
   processor-baggage: uv pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt