Skip to content

Commit b5ffe01

Browse files
authored
chore(ci): bump riot version for 3.7 compatibility issues [backport 2.14] (#11092)
Manual backport of #11085 to 2.14 With the new release of virtualenv==20.27.0, we were seeing new failures with build_base_venv[3.7] (GitLab) and build_base_venv (CircleCI) jobs when running: ``` riot -P -v generate --python=$PYTHON_VERSION ... File "/go/src/github.com/DataDog/apm-reliability/dd-trace-py/.riot/venv_py3717/lib/python3.7/site-packages/pip/_vendor/typing_extensions.py", line 1039 def TypedDict(typename, fields=_marker, /, *, total=True, closed=False, **kwargs): ^ SyntaxError: invalid syntax ERROR:riot.riot:Dev install failed, aborting! ``` We need to pin to virtualenv==20.26.6 to continue supporting python3.7 The upload-artifact and download-artifact bumps were required to unblock the riot CI. It had been a while since the last update to riot, and since then, v2 has been deprecated and v3 will be deprecated next month (Nov 2024), so we are bumping to v4 via tag. The above changes were implemented in riot (DataDog/riot#232), and this PR just bumps the riot version in dd-trace-py from 0.19.1 to 0.20.0 ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
1 parent 09bf799 commit b5ffe01

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

.circleci/config.templ.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ commands:
8080
description: "Install riot"
8181
steps:
8282
# Make sure we install and run riot on Python 3
83-
- run: pip3 install riot==0.19.1
83+
- run: pip3 install riot==0.20.0
8484

8585
setup_rust:
8686
description: "Install rust toolchain"

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: Generate config
3232
command: |
3333
export GIT_COMMIT_DESC=$(git log -n 1 $CIRCLE_SHA1)
34-
pip3 install riot==0.19.1
34+
pip3 install riot==0.20.0
3535
riot -P -v run --pass-env -s circleci-gen-config -- -v
3636
- continuation/continue:
3737
configuration_path: .circleci/config.gen.yml

.github/workflows/generate-package-versions.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
actions: read
1414
contents: write
1515
pull-requests: write
16+
1617
steps:
1718
- uses: actions/checkout@v4
1819

@@ -45,7 +46,7 @@ jobs:
4546
uses: actions/setup-python@v5
4647
with:
4748
python-version: "3.12"
48-
49+
4950
- name: Set up QEMU
5051
uses: docker/setup-qemu-action@v2
5152

@@ -76,7 +77,7 @@ jobs:
7677
python -m pip install --upgrade pip
7778
pip install packaging
7879
pip install requests
79-
pip install riot==0.19.1
80+
pip install riot==0.20.0
8081
8182
- name: Run regenerate-riot-latest
8283
run: scripts/regenerate-riot-latest.sh
@@ -98,4 +99,4 @@ jobs:
9899
base: main
99100
title: "chore: update ${{ env.VENV_NAME }} latest version to ${{ env.NEW_LATEST }}"
100101
labels: changelog/no-changelog
101-
body-path: .github/PULL_REQUEST_TEMPLATE.md
102+
body-path: .github/PULL_REQUEST_TEMPLATE.md

.github/workflows/requirements-locks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: pyenv global 3.10 3.7 3.8 3.9 3.11 3.12
2727

2828
- name: Install Dependencies
29-
run: pip install --upgrade pip && pip install riot
29+
run: pip install --upgrade pip && pip install riot==0.20.0
3030

3131
- name: Generate riot locks
3232
run: scripts/compile-and-prune-test-requirements

.gitlab/package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build_base_venvs:
88
CMAKE_BUILD_PARALLEL_LEVEL: 12
99
PIP_VERBOSE: 1
1010
script:
11-
- pip install riot~=0.19.1
11+
- pip install riot==0.20.0
1212
- riot -P -v generate --python=$PYTHON_VERSION
1313
artifacts:
1414
name: venv_$PYTHON_VERSION

.gitlab/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ variables:
4040
services:
4141
- !reference [.services, ddagent]
4242
script:
43-
- pip install riot~=0.19.1
43+
- pip install riot==0.20.0
4444
- unset DD_SERVICE
4545
- unset DD_ENV
4646
- unset DD_TAGS

hatch.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies = [
1717
"ddapm-test-agent>=1.2.0",
1818
"packaging==23.1",
1919
"pygments==2.16.1",
20-
"riot==0.19.1",
20+
"riot==0.20.0",
2121
"ruff==0.1.3",
2222
"clang-format==18.1.5",
2323
]

scripts/ddtest

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ fi
1919
for i in {1..3}; do $compose_cmd pull -q testrunner && break || sleep 3; done
2020

2121
# TODO(DEV): Install riot in the docker image
22-
FULL_CMD="pip install -q --disable-pip-version-check riot==0.19.1 && $CMD"
23-
22+
FULL_CMD="pip install -q --disable-pip-version-check riot==0.20.0 && $CMD"
2423

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

0 commit comments

Comments
 (0)