Skip to content

Fixing PR failures if pypi.org unavailable #5876

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 6 commits into from
Oct 17, 2022
Merged

Fixing PR failures if pypi.org unavailable #5876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4415e78
Fixing PR failures if pypi.org unavailable
pavera Oct 12, 2022
fcdc181
remove index_url_for_dependency
pavera Oct 12, 2022
b34b098
fix lint issues
pavera Oct 12, 2022
5c22121
already a string.
pavera Oct 12, 2022
7a3382b
Version check improvement
pavera Oct 13, 2022
8467689
Make the spaces more readable/visible
pavera Oct 17, 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
2 changes: 1 addition & 1 deletion python/lib/dependabot/python/file_updater/pip_compile_file_updater.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def write_updated_dependency_files
end

def install_required_python
return if run_command("pyenv versions").include?("#{python_version}\n")
return if run_command("pyenv versions").include?("\ #{python_version}")

run_command("pyenv install -s #{python_version}")
run_command("pyenv exec pip install --upgrade pip")
Expand Down
2 changes: 2 additions & 0 deletions python/lib/dependabot/python/metadata_finder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ def pypi_listing
return @pypi_listing
rescue JSON::ParserError
next
rescue Excon::Error::Timeout
next
end

@pypi_listing = {} # No listing found
Expand Down
2 changes: 2 additions & 0 deletions python/lib/dependabot/python/update_checker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ def poetry_library?

pypi_info = JSON.parse(index_response.body)["info"] || {}
pypi_info["summary"] == details["description"]
rescue Excon::Error::Timeout
false
rescue URI::InvalidURIError
false
end
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -314,7 +314,7 @@ def write_original_manifest_files
end

def install_required_python
return if run_command("pyenv versions").include?("#{python_version}\n")
return if run_command("pyenv versions").include?("\ #{python_version}")

run_command("pyenv install -s #{python_version}")
run_command("pyenv exec pip install --upgrade pip")
Expand Down
2 changes: 1 addition & 1 deletion python/lib/dependabot/python/update_checker/pipenv_version_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def install_required_python
nil
end

return if run_command("pyenv versions").include?("#{python_version}\n")
return if run_command("pyenv versions").include?("\ #{python_version}")

requirements_path = NativeHelpers.python_requirements_path
run_command("pyenv install -s #{python_version}")
Expand Down