Support uv compiled requirements files #10040
Update pip_compile_version_resolver.rb
- Loading branch information
commit 39cc41ea1a47dd9d177bec4e8f5524a0981b66e2
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -251,10 +251,14 @@ def pip_compile_options(filename) | |
| options << "--output-file=#{requirements_file.name}" | ||
| end | ||
|
|
||
| if (requirements_file = compiled_file_for_filename(filename)) | ||
| if requirements_file.content.include?("uv pip compile") | ||
| options += uv_pip_compile_options_from_compiled_file(requirements_file) | ||
| command = "pyenv exec uv pip compile" | ||
| else | ||
| options += pip_compile_options_from_compiled_file(requirements_file) | ||
|
There was a problem hiding this comment. @avilaton , same as above |
||
| command = "pyenv exec pip-compile" | ||
| end | ||
| end | ||
|
|
||
| [options.join(" "), command] | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @avilaton , looks like you added 2 new functions
uv_pip_compile_options_from_compiled_file,pip_compile_options_from_compiled_fileinpip_compile_version_resolver.rb, i think they are being referenced frompip_compile_file_updater.rbcan you please fix this (IDE is showing it as no function exists inDependabot::Python::UpdateChecker::PipCompileVersionResolver)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be neat to have a way not to repeat this code, it seems to me as if it would be more resilient to have them centralized. What do you suggest we should do?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@avilaton , if you think we might benefit from moving them to new location/class and see a additional functionality that could be used across. please do so.