Skip to content

build(deps): bump poetry from 1.1.15 to 1.2.0 in /python/helpers #5599

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 5 commits into from
Sep 2, 2022
Merged

build(deps): bump poetry from 1.1.15 to 1.2.0 in /python/helpers #5599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e170a4
build(deps): bump poetry from 1.1.15 to 1.2.0 in /python/helpers
dependabot[bot] Aug 31, 2022
3dee509
Fixing the output parsing as it has changed in poetry 1.2.0
pavera Aug 31, 2022
359e25e
rubocop
pavera Sep 1, 2022
d61e76b
Update regex for poetry 1.2 output
pavera Sep 1, 2022
e8c893a
linting!
pavera Sep 1, 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/helpers/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ flake8==5.0.4
hashin==0.17.0
pipenv==2022.4.8
pipfile==0.0.2
poetry==1.1.15
poetry>=1.1.15,<=1.2.0
wheel==0.37.1

# Some dependencies will only install if Cython is present
Expand Down
45 changes: 31 additions & 14 deletions python/lib/dependabot/python/update_checker/poetry_version_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require "excon"
require "toml-rb"
require "open3"
require "uri"
require "dependabot/dependency"
require "dependabot/errors"
require "dependabot/shared_helpers"
Expand All @@ -23,18 +24,26 @@ class UpdateChecker
# This class does version resolution for pyproject.toml files.
class PoetryVersionResolver
GIT_REFERENCE_NOT_FOUND_REGEX = /
'git'.*pypoetry-git-(?<name>.+?).{8}',
(?:'git'.*pypoetry-git-(?<name>.+?).{8}',
'checkout',
'(?<tag>.+?)'
/x.freeze
|
...Failedtoclone
(?<url>.+?).gitat'(?<tag>.+?)',
verifyrefexistsonremote)
/x.freeze # TODO: remove the first clause and | when py3.6 support is EoL
GIT_DEPENDENCY_UNREACHABLE_REGEX = /
'\['git',
\s+'clone',
\s+'--recurse-submodules',
\s+'(--)?',
\s+'(?<url>.+?)'.*
\s+exit\s+status\s+128
/mx.freeze
(?:'\['git',
\s+'clone',
\s+'--recurse-submodules',
\s+'(--)?',
\s+'(?<url>.+?)'.*
\s+exit\s+status\s+128
|
\s+Failed\sto\sclone
\s+(?<url>.+?),
\s+check\syour\sgit\sconfiguration)
/mx.freeze # TODO: remove the first clause and | when py3.6 support is EoL

attr_reader :dependency, :dependency_files, :credentials

Expand All @@ -61,7 +70,8 @@ def resolvable?(version:)
false
end
rescue SharedHelpers::HelperSubprocessFailed => e
raise unless e.message.include?("SolverProblemError")
raise unless e.message.include?("SolverProblemError") || # TODO: Remove once py3.6 is EoL
e.message.include?("version solving failed.")

@resolvable[version] = false
end
Expand Down Expand Up @@ -118,8 +128,13 @@ def fetch_version_from_parsed_lockfile(updated_lockfile)
def handle_poetry_errors(error)
if error.message.gsub(/\s/, "").match?(GIT_REFERENCE_NOT_FOUND_REGEX)
message = error.message.gsub(/\s/, "")
name = message.match(GIT_REFERENCE_NOT_FOUND_REGEX).
named_captures.fetch("name")
match = message.match(GIT_REFERENCE_NOT_FOUND_REGEX)
name = if (url = match.named_captures.fetch("url"))
File.basename(URI.parse(url).path)
else
message.match(GIT_REFERENCE_NOT_FOUND_REGEX).
named_captures.fetch("name")
end
raise GitDependencyReferenceNotFound, name
end

Expand All @@ -130,7 +145,8 @@ def handle_poetry_errors(error)
end

raise unless error.message.include?("SolverProblemError") ||
error.message.include?("PackageNotFound")
error.message.include?("PackageNotFound") ||
error.message.include?("version solving failed.")

check_original_requirements_resolvable

Expand Down Expand Up @@ -161,7 +177,8 @@ def check_original_requirements_resolvable
@original_reqs_resolvable = true
rescue SharedHelpers::HelperSubprocessFailed => e
raise unless e.message.include?("SolverProblemError") ||
e.message.include?("PackageNotFound")
e.message.include?("PackageNotFound") ||
e.message.include?("version solving failed.")

msg = clean_error_message(e.message)
raise DependencyFileNotResolvable, msg
Expand Down