Add support for Poetry 1.5 lockfiles

python/lib/dependabot/python/file_updater/poetry_file_updater.rb

@@ -10,6 +10,7 @@
 require "dependabot/python/file_parser/python_requirement_parser"
 require "dependabot/python/file_parser/subdependency_type_parser"
 require "dependabot/python/file_updater"
+require "dependabot/python/helpers"
 require "dependabot/python/native_helpers"
 require "dependabot/python/name_normaliser"
 
@@ -197,24 +198,7 @@ def run_poetry_update_command
         end
 
         def run_poetry_command(command, fingerprint: nil)
-          start = Time.now
-          command = SharedHelpers.escape_command(command)
-          stdout, process = Open3.capture2e(command)
-          time_taken = Time.now - start
-
-          # Raise an error with the output from the shell session if Pipenv
-          # returns a non-zero status
-          return if process.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(
-            message: stdout,
-            error_context: {
-              command: command,
-              fingerprint: fingerprint,
-              time_taken: time_taken,
-              process_exit_value: process.to_s
-            }
-          )
+          Helpers.run_poetry_command(command, fingerprint: fingerprint)
         end
 
         def write_temporary_dependency_files(pyproject_content)

python/lib/dependabot/python/helpers.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "time"
+require "open3"
+
+require "dependabot/errors"
+require "dependabot/shared_helpers"
+
+module Dependabot
+  module Python
+    module Helpers
+      def self.run_poetry_command(command, fingerprint: nil)
+        start = Time.now
+        command = SharedHelpers.escape_command(command)
+        stdout, process = Open3.capture2e(command)
+        time_taken = Time.now - start
+
+        # Raise an error with the output from the shell session if Pipenv
+        # returns a non-zero status
+        return if process.success?
+
+        raise SharedHelpers::HelperSubprocessFailed.new(
+          message: stdout,
+          error_context: {
+            command: command,
+            fingerprint: fingerprint,
+            time_taken: time_taken,
+            process_exit_value: process.to_s
+          }
+        )
+      end
+    end
+  end
+end

python/lib/dependabot/python/update_checker/poetry_version_resolver.rb

@@ -14,6 +14,7 @@
 require "dependabot/python/update_checker"
 require "dependabot/python/version"
 require "dependabot/python/requirement"
+require "dependabot/python/helpers"
 require "dependabot/python/native_helpers"
 require "dependabot/python/authed_url_builder"
 require "dependabot/python/name_normaliser"
@@ -315,24 +316,7 @@ def lockfile
         end
 
         def run_poetry_command(command, fingerprint: nil)
-          start = Time.now
-          command = SharedHelpers.escape_command(command)
-          stdout, process = Open3.capture2e(command)
-          time_taken = Time.now - start
-
-          # Raise an error with the output from the shell session if poetry
-          # returns a non-zero status
-          return if process.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(
-            message: stdout,
-            error_context: {
-              command: command,
-              fingerprint: fingerprint,
-              time_taken: time_taken,
-              process_exit_value: process.to_s
-            }
-          )
+          Helpers.run_poetry_command(command, fingerprint: fingerprint)
         end
 
         def normalise(name)