From dc8591ad84e2f1d99e6d641e8a485fa86a253b9e Mon Sep 17 00:00:00 2001
From: erikayasuda <153395705+erikayasuda@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:11:30 -0400
Subject: [PATCH] chore(ci): bump riot version and pin virtualenv==20.26.6 for
 hatch use with python3.7 [2.11] (#11106)

This PR is a combination of this backport PR
https://github.com/DataDog/dd-trace-py/pull/11085 and an additional
`virtualenv` version pinning fix that were required to unblock the CI
for the 2.11 release branch.

The reason the original backport PR was not sufficient to fix the CI for
2.11 unlike 2.13+ was because of some discrepancies with CircleCI vs.
GitLab. Since 2.11 and 2.12 still run the `appsec_threat_*` tests via
CircleCI, it was somehow still using the newer `virtualenv==20.27.0`
instead of `virtualenv==20.26.0` that we attempted to pin in the
previous backport.

## 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)

---------

Co-authored-by: Taegyun Kim <taegyun.kim@datadoghq.com>
---
 .circleci/config.templ.yml               | 4 ++--
 .circleci/config.yml                     | 2 +-
 .github/workflows/requirements-locks.yml | 2 +-
 .github/workflows/unit_tests.yml         | 3 +++
 hatch.toml                               | 2 +-
 scripts/ddtest                           | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.templ.yml b/.circleci/config.templ.yml
index 8549a59fb82..313e16ee0aa 100644
--- a/.circleci/config.templ.yml
+++ b/.circleci/config.templ.yml
@@ -80,7 +80,7 @@ commands:
     description: "Install riot"
     steps:
       # Make sure we install and run riot on Python 3
-      - run: pip3 install riot==0.19.1
+      - run: pip3 install riot==0.20.0
 
   setup_rust:
     description: "Install rust toolchain"
@@ -91,7 +91,7 @@ commands:
   setup_hatch:
     description: "Install hatch"
     steps:
-      - run: pip3 install hatch~=1.8.0 hatch-containers==0.7.0
+      - run: pip3 install hatch~=1.8.0 hatch-containers==0.7.0 virtualenv==20.26.6
 
   start_docker_services:
     description: "Start Docker services"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cbac9570ebe..fcf74292ee3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ jobs:
           name: Generate config
           command: |
             export GIT_COMMIT_DESC=$(git log -n 1 $CIRCLE_SHA1)
-            pip3 install riot==0.19.1
+            pip3 install riot==0.20.0
             riot -P -v run --pass-env -s circleci-gen-config -- -v
       - continuation/continue:
           configuration_path: .circleci/config.gen.yml
diff --git a/.github/workflows/requirements-locks.yml b/.github/workflows/requirements-locks.yml
index 3192f61db64..3e51e3c229e 100644
--- a/.github/workflows/requirements-locks.yml
+++ b/.github/workflows/requirements-locks.yml
@@ -23,7 +23,7 @@ jobs:
         run: pyenv global 3.10 3.7 3.8 3.9 3.11 3.12
 
       - name: Install Dependencies
-        run: pip install --upgrade pip && pip install riot
+        run: pip install --upgrade pip && pip install riot==0.20.0
 
       - name: Generate riot locks
         run: scripts/compile-and-prune-test-requirements
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index c0a6986ee42..d523b2cb217 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -40,5 +40,8 @@ jobs:
       - name: Install hatch
         run: pip install hatch
 
+      - name: Install virtualenv
+        run: pip install virtualenv==20.26.6
+
       - name: Run tests
         run: hatch run ddtrace_unit_tests:test
diff --git a/hatch.toml b/hatch.toml
index b580fc9c720..2c651975d8c 100644
--- a/hatch.toml
+++ b/hatch.toml
@@ -22,7 +22,7 @@ dependencies = [
     "ddapm-test-agent>=1.2.0",
     "packaging==23.1",
     "pygments==2.16.1",
-    "riot==0.19.1",
+    "riot==0.20.0",
     "ruff==0.1.3",
     "clang-format==18.1.5",
 ]
diff --git a/scripts/ddtest b/scripts/ddtest
index 9003d0446e7..08d703af076 100755
--- a/scripts/ddtest
+++ b/scripts/ddtest
@@ -12,7 +12,7 @@ fi
 # retry docker pull if fails
 for i in {1..3}; do docker-compose pull -q testrunner && break || sleep 3; done
 
-FULL_CMD="pip install -q --disable-pip-version-check riot==0.19.1 hatch && $CMD"
+FULL_CMD="pip install -q --disable-pip-version-check riot==0.20.0 hatch~=1.8.0 virtualenv==20.26.6 && $CMD"
 
 
 # install and upgrade riot in case testrunner image has not been updated