Update

Author: yushan8

gazelle/python/generate.go

@@ -123,6 +123,7 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 			pyFileNames.Add(f)
 			if !hasPyBinaryEntryPointFile && f == pyBinaryEntrypointFilename {
 				hasPyBinaryEntryPointFile = true
+				pyLibraryFilenames.Add(f)
 			} else if !hasPyTestEntryPointFile && f == pyTestEntrypointFilename {
 				hasPyTestEntryPointFile = true
 			} else if f == conftestFilename {
@@ -247,9 +248,9 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 
 				// Remove the file from srcs if we're doing per-file library generation so
 				// that we don't also generate a py_library target for it.
-				if cfg.PerFileGeneration() {
-					srcs.Remove(name)
-				}
+				// if cfg.PerFileGeneration() {
+				// 	srcs.Remove(name)
+				// }
 			}
 			sort.Strings(mainFileNames)
 			for _, filename := range mainFileNames {
@@ -352,6 +353,7 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 			collisionErrors.Add(err)
 		}
 
+		// Create the py_binary target that depends on the py_library
 		pyBinaryTarget := newTargetBuilder(pyBinaryKind, pyBinaryTargetName, pythonProjectRoot, args.Rel, pyFileNames).
 			setMain(pyBinaryEntrypointFilename).
 			addVisibility(visibility).

gazelle/python/resolve.go

@@ -55,7 +55,7 @@ func (*Resolver) Name() string { return languageName }
 // If nil is returned, the rule will not be indexed. If any non-nil slice is
 // returned, including an empty slice, the rule will be indexed.
 func (py *Resolver) Imports(c *config.Config, r *rule.Rule, f *rule.File) []resolve.ImportSpec {
-	if !indexPyBinaryImport(r, f) {
+	if r.Kind() == "py_binary" {
 		return nil
 	}
 	cfgs := c.Exts[languageName].(pythonconfig.Configs)
@@ -369,29 +369,3 @@ func convertDependencySetToExpr(set *treeset.Set) bzl.Expr {
 	}
 	return &bzl.ListExpr{List: deps}
 }
-
-// indexPyBinaryImport returns whether the corresponding py_binary rule need to be indexed.
-// To avoid multiple labels indexing the same import,
-// check if there is a corresponding py_library rule with the same srcs.
-func indexPyBinaryImport(r *rule.Rule, f *rule.File) bool {
-	// If the rule is not a py_binary, it should be indexed.
-	if r.Kind() != "py_binary" {
-		return true
-	}
-	pyBinarySrcs := r.AttrStrings("srcs")
-	if len(pyBinarySrcs) == 0 {
-		return false
-	}
-	for _, otherRule := range f.Rules {
-		if otherRule.Kind() != "py_library" {
-			continue
-		}
-		pyLibrarySrcs := otherRule.AttrStrings("srcs")
-		for _, src := range pyLibrarySrcs {
-			if src == pyBinarySrcs[0] {
-				return false
-			}
-		}
-	}
-	return true
-}