From d610023527eed369ebf83597484ee212648eae62 Mon Sep 17 00:00:00 2001
From: Greyson Lalonde <greyson.r.lalonde@gmail.com>
Date: Fri, 12 Sep 2025 22:57:42 -0400
Subject: [PATCH] fix: resolve pytest conftest conflicts with package-specific
 configs

---
 .github/workflows/tests.yml       | 2 +-
 .github/workflows/tools-tests.yml | 2 +-
 packages/crewai/pyproject.toml    | 6 ++++++
 packages/tools/pyproject.toml     | 1 +
 pyproject.toml                    | 8 --------
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a1b864305..dc73d96bd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -75,7 +75,7 @@ jobs:
           #   DURATIONS_ARG="--durations-path=${DURATION_FILE}"
           # fi
           
-          uv run pytest \
+          uv run --package crewai-core pytest \
             --block-network \
             --timeout=30 \
             -vv \
diff --git a/.github/workflows/tools-tests.yml b/.github/workflows/tools-tests.yml
index 312cf7931..9541d397a 100644
--- a/.github/workflows/tools-tests.yml
+++ b/.github/workflows/tools-tests.yml
@@ -39,4 +39,4 @@ jobs:
         run: uv sync --dev --all-extras
 
       - name: Run tests
-        run: uv run pytest packages/tools/tests -vv
+        run: uv run --package crewai-tools pytest -vv
diff --git a/packages/crewai/pyproject.toml b/packages/crewai/pyproject.toml
index 32413c304..057a24611 100644
--- a/packages/crewai/pyproject.toml
+++ b/packages/crewai/pyproject.toml
@@ -71,6 +71,12 @@ qdrant = [
 [project.scripts]
 crewai = "crewai.cli.cli:crewai"
 
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+markers = [
+    "telemetry: mark test as a telemetry test (don't mock telemetry)",
+]
+
 [tool.hatch.version]
 path = "src/crewai/__init__.py"
 
diff --git a/packages/tools/pyproject.toml b/packages/tools/pyproject.toml
index 4fb671b18..b80d6e4a7 100644
--- a/packages/tools/pyproject.toml
+++ b/packages/tools/pyproject.toml
@@ -136,6 +136,7 @@ contextual = [
 ]
 
 [tool.pytest.ini_options]
+testpaths = ["tests"]
 pythonpath = ["."]
 
 [tool.hatch.version]
diff --git a/pyproject.toml b/pyproject.toml
index 9ca99f073..f266feeda 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -86,14 +86,6 @@ ignore = ["E501"]  # ignore line too long
 [tool.mypy]
 exclude = ["packages/crewai/src/crewai/cli/templates", "packages/*/tests"]
 
-[tool.pytest.ini_options]
-testpaths = [
-    "packages/crewai/tests",
-    "packages/tools/tests",
-]
-markers = [
-    "telemetry: mark test as a telemetry test (don't mock telemetry)",
-]
 
 # PyTorch index configuration, since torch 2.5.0 is not compatible with python 3.13
 [[tool.uv.index]]