Skip to content

Commit 41d8ccd

Browse files
authored
Merge branch 'main' into fix_gevent_regression
2 parents fc2b6ec + 6ae6225 commit 41d8ccd

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,3 @@ 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))

0 commit comments

Comments
 (0)