Merge pull request #5688 from dependabot/jakecoffman/poetry-git

fix Poetry not using system git
dependabot · Sep 12, 2022 · e02b625 · e02b625
2 parents 9ae2fb9 + a97751d
commit e02b625
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/python/lib/dependabot/python/file_updater/poetry_file_updater.rb b/python/lib/dependabot/python/file_updater/poetry_file_updater.rb
@@ -177,6 +177,11 @@ def updated_lockfile_content_for(pyproject_content)
                                    "#{NativeHelpers.python_requirements_path}")
               end
 
+              # use system git instead of the pure Python dulwich
+              unless python_version&.start_with?("3.6")
+                run_poetry_command("pyenv exec poetry config experimental.system-git-client true")
+              end
+
               run_poetry_command(poetry_update_command)
 
               return File.read("poetry.lock") if File.exist?("poetry.lock")

diff --git a/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb b/python/lib/dependabot/python/update_checker/poetry_version_resolver.rb
@@ -28,6 +28,10 @@ class PoetryVersionResolver
           'checkout',
           '(?<tag>.+?)'
           |
+          Failed to checkout
+          (?<tag>.+?)
+          (?<url>.+?).git at '(?<tag>.+?)'
+          |
           ...Failedtoclone
           (?<url>.+?).gitat'(?<tag>.+?)',
           verifyrefexistsonremote)
@@ -78,6 +82,7 @@ def resolvable?(version:)
 
         private
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def fetch_latest_resolvable_version_string(requirement:)
           @latest_resolvable_version_string ||= {}
           return @latest_resolvable_version_string[requirement] if @latest_resolvable_version_string.key?(requirement)
@@ -97,6 +102,11 @@ def fetch_latest_resolvable_version_string(requirement:)
                   )
                 end
 
+                # use system git instead of the pure Python dulwich
+                unless python_version&.start_with?("3.6")
+                  run_poetry_command("pyenv exec poetry config experimental.system-git-client true")
+                end
+
                 # Shell out to Poetry, which handles everything for us.
                 run_poetry_command(poetry_update_command)
 
@@ -113,6 +123,7 @@ def fetch_latest_resolvable_version_string(requirement:)
               end
             end
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def fetch_version_from_parsed_lockfile(updated_lockfile)
           version =