Skip to content

Commit c3e88a3

Browse files
committed
Revert "Reapply "Fix: Unable to run ADOT Python unit tests with latest Tox release (aws-observability#521)" (aws-observability#523) (aws-observability#527)"
This reverts commit 49f8a7a.
1 parent 49f8a7a commit c3e88a3

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

.github/actions/set_up/action.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ runs:
2727

2828
- name: Install tox
2929
shell: bash
30-
run: |
31-
pip install tox==4.30.3
30+
run: pip install tox==3.27.1 tox-factor
3231

3332
- name: Cache tox environment
3433
# Preserves .tox directory between runs for faster installs
@@ -42,7 +41,4 @@ runs:
4241
- name: Run unit tests/benchmarks with tox
4342
if: ${{ inputs.run_unit_tests == 'true' }}
4443
shell: bash
45-
run: |
46-
ENV_NAME="${{ inputs.python_version }}-test-${{ inputs.package_name }}"
47-
echo "Running tox env: $ENV_NAME"
48-
tox -e "$ENV_NAME" -- -ra
44+
run: tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra

CHANGELOG.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
1717
([#497](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/497))
1818
- Fix timeout handling for exceeded deadline in retry logic in OTLPAwsLogsExporter
1919
([#501](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/501))
20-
- Fix: Unable to run ADOT Python unit tests with latest Tox release
21-
([#521](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/521))
2220
- Fix Gevent patch regression with correct import order
2321
([#522](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/522))
2422
- Bump ADOT Python version to 0.13.0 and OTel dependencies to 1.37.0/0.58b0
2523
([#524](https://github.com/aws-observability/aws-otel-python-instrumentation/pull/524))
26-

tox.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ commands_pre =
3434
; Install common packages for all the tests. These are not needed in all the
3535
; cases but it saves a lot of boilerplate in this file.
3636
test: pip install botocore
37-
test: pip install opentelemetry-api[test]@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
38-
test: pip install opentelemetry-sdk[test]@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
39-
test: pip install opentelemetry-instrumentation[test]@{env:CONTRIB_REPO}\#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation
40-
test: pip install opentelemetry-exporter-otlp[test]@{env:CORE_REPO}\#egg=opentelemetry-exporter-otlp&subdirectory=exporter/opentelemetry-exporter-otlp
41-
test: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
37+
test: pip install "opentelemetry-api[test] @ {env:CORE_REPO}#egg=opentelemetry-api&subdirectory=opentelemetry-api"
38+
test: pip install "opentelemetry-sdk[test] @ {env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
39+
test: pip install "opentelemetry-instrumentation[test] @ {env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"
40+
test: pip install "opentelemetry-exporter-otlp[test] @ {env:CORE_REPO}#egg=opentelemetry-exporter-otlp&subdirectory=exporter/opentelemetry-exporter-otlp"
41+
test: pip install "opentelemetry-test-utils @ {env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils"
4242
aws-opentelemetry-distro: pip install {toxinidir}/aws-opentelemetry-distro
4343

4444
commands =

0 commit comments

Comments
 (0)