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

feat(manager/pip-compile): Handle some edge-cases with -r dependencies #28208

Merged
merged 4 commits into from
Apr 16, 2024

Conversation

mbudnek
Copy link
Contributor

@mbudnek mbudnek commented Apr 1, 2024

Changes

This adds handling for two edge-cases I missed in #28052:

  1. A -r dependency on a multi-input lock file; i.e.
graph LR
common.txt[[common.txt]]
final.txt[[final.txt]]
1.in --> common.txt
2.in --> common.txt
common.txt --> 3.in
3.in --> final.txt
Loading
  1. An input file with multiple transitive -r dependencies on the same file, i.e.
graph LR
common.in --> mid1.in
common.in --> mid2.in
mid1.in --> final.in
mid2.in --> final.in
Loading

CC @not7cd

Context

#28050
#28052 (specifically #28052 (comment))

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

This adds handling for two edge-cases I missed in my previous PR to
support -r dependencies:

1. A -r dependency on a multi-input lock file
2. An input file with multiple transitive -r dependencies on the same
   input file.
lib/modules/manager/pip-compile/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/pip-compile/extract.ts Outdated Show resolved Hide resolved
lib/modules/manager/pip-compile/extract.ts Outdated Show resolved Hide resolved
@mbudnek mbudnek requested a review from viceice April 10, 2024 21:27
@viceice viceice requested a review from not7cd April 11, 2024 08:48
@rarkins rarkins added this pull request to the merge queue Apr 16, 2024
Merged via the queue into renovatebot:main with commit c4a5ac8 Apr 16, 2024
37 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.301.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@mbudnek mbudnek deleted the pip-compile/dash-r-multiple-files branch April 17, 2024 21:50
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants