Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
8 changes: 6 additions & 2 deletions .github/actions/set_up/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ runs:

- name: Install tox
shell: bash
run: pip install tox==3.27.1 tox-factor
run: |
pip install tox

- name: Cache tox environment
# Preserves .tox directory between runs for faster installs
Expand All @@ -41,4 +42,7 @@ runs:
- name: Run unit tests/benchmarks with tox
if: ${{ inputs.run_unit_tests == 'true' }}
shell: bash
run: tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra
run: |
ENV_NAME="${{ inputs.python_version }}-test-${{ inputs.package_name }}"
echo "Running tox env: $ENV_NAME"
tox -e "$ENV_NAME" -- -ra
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
([#497](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/497))
- Fix timeout handling for exceeded deadline in retry logic in OTLPAwsLogsExporter
([#501](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/501))
- Fix: Unable to run ADOT Python unit tests with latest Tox release
([#521](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/521))
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ commands_pre =
; cases but it saves a lot of boilerplate in this file.
test: pip install botocore
test: pip install gevent
test: pip install "opentelemetry-api[test] @ {env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
test: pip install "opentelemetry-sdk[test] @ {env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
test: pip install "opentelemetry-instrumentation[test] @ {env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
test: pip install "opentelemetry-exporter-otlp[test] @ {env:CORE_REPO}#egg=opentelemetry-exporter-otlp&subdirectory=exporter/opentelemetry-exporter-otlp"
test: pip install "opentelemetry-test-utils @ {env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils"
test: pip install opentelemetry-api[test]@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
test: pip install opentelemetry-sdk[test]@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
test: pip install opentelemetry-instrumentation[test]@{env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation
test: pip install opentelemetry-exporter-otlp[test]@{env:CORE_REPO}\#egg=opentelemetry-exporter-otlp&subdirectory=exporter/opentelemetry-exporter-otlp
test: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
aws-opentelemetry-distro: pip install {toxinidir}/aws-opentelemetry-distro

commands =
Expand Down