From afbc118a2caab6313b0e1ef566b58f26c44ebd7c Mon Sep 17 00:00:00 2001
From: Kevin Fairise <kevin.fairise@datadoghq.com>
Date: Wed, 21 Jan 2026 14:24:00 +0100
Subject: [PATCH] Merge deps group of test-infra-definitions inside tasks,
 after tif merge

---
 pyproject.toml              | 1 +
 src/dda/cli/inv/__init__.py | 3 ---
 uv.lock                     | 9 +++++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6cb03333..08ead013 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -150,6 +150,7 @@ legacy-tasks = [
     { include-group = "legacy-github" },
     { include-group = "legacy-notifications" },
     { include-group = "legacy-release" },
+    { include-group = "legacy-test-infra-definitions" },
     "debugpy==1.8.2",
     "rich==14.0.0",
     "watchdog==6.0.0",
diff --git a/src/dda/cli/inv/__init__.py b/src/dda/cli/inv/__init__.py
index 2561f8d2..065a8b29 100644
--- a/src/dda/cli/inv/__init__.py
+++ b/src/dda/cli/inv/__init__.py
@@ -70,9 +70,6 @@ def cmd(
         return
 
     features = ["legacy-tasks", *extra_features]
-    invoke_args = [arg for arg in args if not arg.startswith("-")]
-    if invoke_args and Path.cwd().name == "test-infra-definitions":
-        features.append("legacy-test-infra-definitions")
 
     workdir = Path.cwd()
     if repo:
diff --git a/uv.lock b/uv.lock
index f2679864..73821e0c 100644
--- a/uv.lock
+++ b/uv.lock
@@ -669,6 +669,7 @@ legacy-tasks = [
     { name = "beautifulsoup4" },
     { name = "boto3" },
     { name = "codeowners" },
+    { name = "colorama" },
     { name = "datadog-api-client" },
     { name = "debugpy" },
     { name = "dmgbuild", marker = "sys_platform == 'darwin'" },
@@ -688,10 +689,12 @@ legacy-tasks = [
     { name = "packaging" },
     { name = "pandoc" },
     { name = "parameterized" },
+    { name = "pydantic" },
     { name = "pygithub" },
     { name = "pygments" },
     { name = "pyjwt" },
     { name = "pymdown-extensions" },
+    { name = "pyperclip" },
     { name = "pyright" },
     { name = "python-gitlab" },
     { name = "pyyaml" },
@@ -702,6 +705,7 @@ legacy-tasks = [
     { name = "semver" },
     { name = "slack-sdk" },
     { name = "tabulate", extra = ["widechars"] },
+    { name = "termcolor" },
     { name = "toml" },
     { name = "types-pyyaml" },
     { name = "types-requests" },
@@ -869,7 +873,9 @@ legacy-tasks = [
     { name = "atlassian-python-api", specifier = "==4.0.7" },
     { name = "beautifulsoup4", specifier = "~=4.12.3" },
     { name = "boto3", specifier = "==1.38.8" },
+    { name = "boto3", specifier = ">=1.28.0" },
     { name = "codeowners", specifier = "==0.6.0" },
+    { name = "colorama", specifier = ">=0.4.6" },
     { name = "datadog-api-client", specifier = "==2.46.0" },
     { name = "debugpy", specifier = "==1.8.2" },
     { name = "dmgbuild", marker = "sys_platform == 'darwin'", specifier = "==1.6.5" },
@@ -889,10 +895,12 @@ legacy-tasks = [
     { name = "packaging", specifier = "==25.0" },
     { name = "pandoc", specifier = "==2.4" },
     { name = "parameterized", specifier = "==0.9.0" },
+    { name = "pydantic", specifier = "==2.11.4" },
     { name = "pygithub", specifier = "==1.59.1" },
     { name = "pygments", specifier = "~=2.17.2" },
     { name = "pyjwt", specifier = "==2.4.0" },
     { name = "pymdown-extensions", specifier = "~=10.5.0" },
+    { name = "pyperclip", specifier = "==1.11.0" },
     { name = "pyright", specifier = "==1.1.391" },
     { name = "python-gitlab", specifier = "==4.4.0" },
     { name = "pyyaml", specifier = "==6.0.1" },
@@ -903,6 +911,7 @@ legacy-tasks = [
     { name = "semver", specifier = "==2.10.0" },
     { name = "slack-sdk", specifier = "~=3.27.1" },
     { name = "tabulate", extras = ["widechars"], specifier = "==0.9.0" },
+    { name = "termcolor", specifier = "==2.5.0" },
     { name = "toml", specifier = "==0.10.2" },
     { name = "toml", specifier = "~=0.10.2" },
     { name = "types-pyyaml", specifier = "==6.0.12.20240311" },