Skip to content

Conversation

@thejcannon
Copy link
Contributor

@thejcannon thejcannon commented Jan 6, 2026

Re-introduces the gazelle behavior of adding conftest targets to tests so that
they inherit parent directory configs.

Fixes #3497

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @thejcannon, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly improves the integration of pytest with Gazelle's Python extension by enabling the automatic discovery and inclusion of conftest.py files from parent directories. This ensures that py_test rules correctly inherit shared fixtures and configurations, leading to more robust and maintainable test setups. The change addresses a previous limitation where only conftest.py files in the immediate directory were considered, streamlining the dependency management for pytest users.

Highlights

  • Ancestor conftest.py Discovery: Implemented a new function, findConftestPaths, which efficiently traverses parent directories to locate all relevant conftest.py files from the current package up to a specified project root.
  • Enhanced py_test Dependency Resolution: Gazelle's Python extension now automatically adds all discovered ancestor conftest.py files as dependencies for py_test rules, in addition to sibling conftest.py files.
  • Bug Fix: This change resolves issue Bug/regression: Ancestor conftest inclusion #3497, addressing a limitation where py_test rules did not correctly recognize conftest.py files located in parent directories.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a valuable feature to Gazelle by adding support for ancestor conftest.py files, which aligns Gazelle's behavior more closely with Pytest's discovery mechanism. The implementation is clean and effective. The new findConftestPaths function correctly traverses the directory hierarchy, and the logic in GenerateRules has been nicely refactored to incorporate this. The updated test outputs confirm the change works as expected. Overall, this is a well-executed improvement.

@thejcannon thejcannon marked this pull request as ready for review January 6, 2026 20:54
@aignas aignas mentioned this pull request Jan 9, 2026
14 tasks
rickeylev
rickeylev previously approved these changes Jan 10, 2026
@rickeylev rickeylev added this pull request to the merge queue Jan 10, 2026
@dougthor42 dougthor42 removed this pull request from the merge queue due to a manual request Jan 10, 2026
@rickeylev
Copy link
Collaborator

@dougthor42 : I see you removed it from the merge queue. Do you want me to undo my review and let you handle this PR? I just approved because I saw it requested for 1.8-rc2. I'm fine with omitting this from RC2 if you want time to review.

}

// findConftestPaths returns package paths containing conftest.py, from currentPkg
// up through ancestors, stopping at pythonProjectRoot (or repo root if empty).
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

N.B.: There are valid cases where there exists one or more conftest.py files that are above pythonProjectRoot:

MODULE.bazel
conftest.py
src/             # gazelle:python_root
  package1/
    subpackage/
      conftest.py
      foo.py
      foo_test.py
  package2/
    ...

I think we should ignore the pythonProjectRoot and only stop at the Bazel module root when searching.

conftestModule := Module{
Name: importSpecFromSrc(pythonProjectRoot, conftestPkg, conftestFilename).Imp,
}
pyTestTarget.deps.Add(conftestModule)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why you changed from pyTestTarget.addModuleDependency() to pyTestTarget.deps.Add()?

@rickeylev rickeylev dismissed their stale review January 10, 2026 21:24

letting doug approve/review

Copy link
Collaborator

@dougthor42 dougthor42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see you removed it from the merge queue. Do you want me to undo my review and let you handle this PR? I just approved because I saw it requested for 1.8-rc2. I'm fine with omitting this from RC2 if you want time to review.

It depends on how quickly the requested change can be added.

The core idea of it and the implementation are great, but there's a case that I would think is common.

I've marked Request Changes but can switch to "Approved and trust it gets fixed before merge" if that would be better.

@rickeylev
Copy link
Collaborator

I'm tagging RC2 now, so I'll just omit this PR for now.

@thejcannon
Copy link
Contributor Author

I'll get to the comments tonight hopefully when I crack open my laptop.

It's also no rush on my end, I've already patched my way to using it at $work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug/regression: Ancestor conftest inclusion

3 participants