Skip to content

Conversation

@aignas
Copy link
Collaborator

@aignas aignas commented Jan 9, 2026

Some packages like use platlib in the data to put the main files. This
PR is implementing correct handling of such packages by recursively
merging two trees. If we have any collisions, we will print an error
and stop. That is unlikely but better to be safe. Users can patch the
failure to be a warning if necessary.

In order to make this more testable, move the functions to a separate
file.

Fixes #3500
Fixes #2949
To be cherry-picked as part of #3466

Some packages like use `platlib` in the data to put the main files. This
PR is implementing correct handling of such packages by recursively
merging two trees. If we have any collisions, we will print an error
and stop. That is unlikely but better to be safe. Users can patch the
failure to be a warning if necessary.

In order to make this more testable, move the functions to a separate
file.

Fixes bazel-contrib#3500
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @aignas, 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 enhances the pipstar functionality by introducing a robust method for handling Python packages that utilize platlib and purelib directories within their .data section. The primary goal is to ensure these components are correctly integrated into the installation path through a recursive merging process, preventing potential file conflicts. The extraction logic has been refactored into a new Starlark file for improved organization and maintainability, and an example has been updated to validate the new behavior.

Highlights

  • Correct handling of platlib and purelib in .data: Implemented a recursive merging mechanism for directories within the .data section of Python wheels, specifically for 'platlib' and 'purelib' components, to correctly place them into 'site-packages'. This resolves issues where some packages (like libclang) use these directories to store main files.
  • Collision detection: The new merging logic includes collision detection, which will result in an error and stop the process if conflicting files are found during the merge. This ensures data integrity, with an option for users to downgrade to a warning if needed.
  • Refactoring of wheel extraction logic: The core wheel extraction logic, previously in whl_library.bzl, has been moved to a new, dedicated Starlark file whl_extract.bzl. This improves modularity and testability of the extraction process.
  • Example update for testing: The libclang package has been added to the examples/pip_parse project to provide a concrete test case for the new platlib/purelib handling functionality.

🧠 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 correctly handles platlib and purelib in wheel .data directories by implementing a tree merge logic, which is a solid improvement over the previous simple rename approach. The refactoring of this logic into a new whl_extract.bzl file also improves code organization. I've found a couple of potential issues in the new merge_trees function that could lead to a crash or silent failures and have provided suggestions to make it more robust.

@aignas aignas mentioned this pull request Jan 9, 2026
14 tasks
@rickeylev rickeylev added this pull request to the merge queue Jan 10, 2026
@rickeylev
Copy link
Collaborator

re: error on collision: what do other installers do?

Merged via the queue into bazel-contrib:main with commit 62acad6 Jan 10, 2026
4 checks passed
rickeylev pushed a commit that referenced this pull request Jan 10, 2026
Some packages like use `platlib` in the data to put the main files. This
PR is implementing correct handling of such packages by recursively
merging two trees. If we have any collisions, we will print an error
and stop. That is unlikely but better to be safe. Users can patch the
failure to be a warning if necessary.

In order to make this more testable, move the functions to a separate
file.

Fixes #3500
Fixes #2949
To be cherry-picked as part of #3466

(cherry picked from commit 62acad6)
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.

pipstar regression: Could not rename ... : already exists feat: enable pipstar by default

2 participants