Skip to content

Commit faa3ba5

Browse files
authored
ci: pin riot and fix starlette tests [backport #5304 to 1.8] (#5309)
backports: #5304 ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/contributing.html#Release-Note-Guidelines) are followed. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Author is aware of the performance implications of this PR as reported in the benchmarks PR comment. ## Reviewer Checklist - [ ] Title is accurate. - [ ] No unnecessary changes are introduced. - [ ] Description motivates each change. - [ ] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [ ] Testing strategy adequately addresses listed risk(s). - [ ] Change is maintainable (easy to change, telemetry, documentation). - [ ] Release note makes sense to a user of the library. - [ ] Reviewer is aware of, and discussed the performance implications of this PR as reported in the benchmarks PR comment.
1 parent f0e4b8d commit faa3ba5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ commands:
6868
description: "Install riot"
6969
steps:
7070
# Make sure we install and run riot on Python 3
71-
- run: pip3 install riot
71+
- run: pip3 install riot==0.16.0
7272

7373
restore_tox_cache:
7474
description: "Restore .tox directory from previous runs for faster installs"

scripts/ddtest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212
# retry docker pull if fails
1313
for i in {1..3}; do docker-compose pull -q testrunner && break || sleep 3; done
1414

15-
FULL_CMD="pip install -q --disable-pip-version-check riot tox && $CMD"
15+
FULL_CMD="pip install -q --disable-pip-version-check riot==0.16.0 tox && $CMD"
1616

1717
# install and upgrade tox and riot in case testrunner image has not been updated
1818
# DEV: Use `--no-TTY` and `--quiet-pull` when running in CircleCI

tests/contrib/starlette/test_starlette.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525

2626
starlette_version_str = getattr(starlette, "__version__", "0.0.0")
27-
starlette_version = tuple([int(i) for i in starlette_version_str.split(".")])
27+
starlette_version = tuple([int(i) for i in starlette_version_str.split(".")[:3]])
2828

2929

3030
@pytest.fixture

0 commit comments

Comments
 (0)