Skip to content

The new pip resolver is not backwards compatible #5540

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.

Sign up for GitHub

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

Merged
pavera merged 8 commits into from
Aug 16, 2022
Merged

The new pip resolver is not backwards compatible #5540

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da8e5aa
Retry if --resolver is not an available arg
pavera Aug 15, 2022
84c58aa
Use the python version as the key to indicate backwards compatibility…
pavera Aug 15, 2022
22f009d
PR feedback changes
pavera Aug 16, 2022
5e6cf9a
invert logic of the version check
pavera Aug 16, 2022
39fccf9
Use a more precise version match
pavera Aug 16, 2022
67f5e24
temporary fix for broken setuptools
pavera Aug 16, 2022
80e30b7
Revert "temporary fix for broken setuptools"
pavera Aug 16, 2022
5193826
Merge branch 'main' into pavera/fix-5405
pavera Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions python/lib/dependabot/python/update_checker/pip_compile_version_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def fetch_latest_resolvable_version_string(requirement:)
rescue SharedHelpers::HelperSubprocessFailed => e
retry_count ||= 0
retry_count += 1

if compilation_error?(e) && retry_count <= 1
@build_isolation = false
retry
Expand Down Expand Up @@ -216,10 +215,15 @@ def run_command(command, env: python_env)
)
end

def new_resolver_supported?
python_version >= Python::Version.new("3.7")
end

def pip_compile_options(filename)
options = @build_isolation ? ["--build-isolation"] : ["--no-build-isolation"]
options += pip_compile_index_options
options += ["--resolver backtracking", "--allow-unsafe"]
options += ["--allow-unsafe"]
options += ["--resolver backtracking"] if new_resolver_supported?

if (requirements_file = compiled_file_for_filename(filename))
options << "--output-file=#{requirements_file.name}"
Expand Down