Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: split on site-packages path segment when reporting conflicts #413

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

mattem
Copy link
Member

@mattem mattem commented Oct 16, 2024

When expanding wheels via rules_pycross' pycross_wheel_library, the wheels end up in bazel-out, rather than within the runfiles tree like when consuming from rules_python. To account for this, change the delimiter to site-packages/ given that is the actual common ancestor in the path.

This also changes to using the full paths for reporting the conflict to make it easier to see where the incoming conflict is from.

Closes #359


Changes are visible to end-users: yes

  • Searched for relevant documentation and updated as needed: yes
  • Breaking change (forces users to change their own code or config): no
  • Suggested release notes appear below: yes

Use site-packages/ as path delimiter when reporting venv package conflicts.

Test plan

  • Covered by existing test cases
  • Manual testing; please provide instructions so we can reproduce:

Run against https://github.com/tgeng/pycross_venv_bug_repro

@mattem mattem enabled auto-merge (squash) October 17, 2024 00:00
@mattem mattem merged commit 581e662 into main Oct 17, 2024
14 checks passed
@mattem mattem deleted the dont_panic_on_conflicts branch October 17, 2024 01:25
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]: Wrong delimiter in conflict detection code?
2 participants