fix 3497

Author: thejcannon

gazelle/go.mod

@@ -1,6 +1,6 @@
 module github.com/bazel-contrib/rules_python/gazelle
 
-go 1.21.13
+go 1.22.0
 
 require (
 	github.com/bazelbuild/bazel-gazelle v0.36.0

gazelle/python/generate.go

@@ -66,6 +66,24 @@ func matchesAnyGlob(s string, globs []string) bool {
 	return false
 }
 
+// findConftestPaths returns package paths containing conftest.py, from currentPkg
+// up through ancestors, stopping at pythonProjectRoot (or repo root if empty).
+func findConftestPaths(repoRoot, currentPkg, pythonProjectRoot string) []string {
+	var result []string
+	for pkg := currentPkg; ; pkg = filepath.Dir(pkg) {
+		if pkg == "." {
+			pkg = ""
+		}
+		if _, err := os.Stat(filepath.Join(repoRoot, pkg, conftestFilename)); err == nil {
+			result = append(result, pkg)
+		}
+		if pkg == "" || pkg == pythonProjectRoot {
+			break
+		}
+	}
+	return result
+}
+
 // GenerateRules extracts build metadata from source files in a directory.
 // GenerateRules is called in each directory where an update is requested
 // in depth-first post-order.
@@ -481,14 +499,15 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 	}
 
 	for _, pyTestTarget := range pyTestTargets {
-		if conftest != nil {
-			conftestModule := Module{Name: importSpecFromSrc(pythonProjectRoot, args.Rel, conftestFilename).Imp}
-			if pyTestTarget.annotations.includePytestConftest == nil {
-				// unset; default behavior
-				pyTestTarget.addModuleDependency(conftestModule)
-			} else if *pyTestTarget.annotations.includePytestConftest {
-				// set; add if true, do not add if false
-				pyTestTarget.addModuleDependency(conftestModule)
+		shouldAddConftest := pyTestTarget.annotations.includePytestConftest == nil ||
+		*pyTestTarget.annotations.includePytestConftest
+
+		if shouldAddConftest {
+			for _, conftestPkg := range findConftestPaths(args.Config.RepoRoot, args.Rel, pythonProjectRoot) {
+				conftestModule := Module{
+					Name: importSpecFromSrc(pythonProjectRoot, conftestPkg, conftestFilename).Imp,
+				}
+				pyTestTarget.deps.Add(conftestModule)
 			}
 		}
 		pyTest := pyTestTarget.build()

gazelle/python/testdata/simple_test_with_conftest/bar/BUILD.out

@@ -23,5 +23,6 @@ py_test(
     deps = [
         ":bar",
         ":conftest",
+        "//:conftest",
     ],
 )

gazelle/python/testdata/simple_test_with_conftest_sibling_imports_disabled/bar/BUILD.out

@@ -22,6 +22,7 @@ py_test(
     main = "__test__.py",
     deps = [
         ":conftest",
+        "//:conftest",
         "//:simple_test_with_conftest_sibling_imports_disabled",
     ],
 )