dependabot-python 0.93.14 → 0.93.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 504ca5ca518d9a06907b4a63aeff627a72118fc5e5bad19471ca3e2dc1710eb9
-  data.tar.gz: 53474839560444ac445437109ce07c978bed158ee465dc91649bf37d4a776e0d
+  metadata.gz: ca48499d2e85ad14651c7087d886a76062cddcec7cd3ab93dc3327d417775201
+  data.tar.gz: 520d16c6c5a45b5744441c14e364f8f97c740db3483c69675d9b66d78f941ba6
 SHA512:
-  metadata.gz: e5a7243bd275ddcc91e32b7d6be38a7a984291d3777dd77e3afd0e8dced488ae8dc90adeb1b376eff40e6dab98391877550e48c75b051e68a371a31e8443440c
-  data.tar.gz: 8dc29ba52605a0f9fa04d6c069990bc58455c8d6e6ea7268b8a6e262e93fb6fe8e2e61c9dacae9644a5cef7c54a86cf4977ccf9a2dc339522554aa9a2c792074
+  metadata.gz: c6b9bd9fc237aac705dd0fc549f46cccde1bdf09881a61a3d31dcd9041c768041ca7bc2e1395e9bb27671bc857144bc6e5a9efc02837e8b67b0117326ea599fd
+  data.tar.gz: 182893921326f80adb6c1fef214d0aca83f8b7c05fddd0c4bf0ced235a99039e199fcab6266c5fb55aad216225152bd226f872801e8449390fd80e39ef01e6b9

data/lib/dependabot/python/update_checker/pip_compile_version_resolver.rb

@@ -91,7 +91,7 @@ module Dependabot
           if error.message.include?("Could not find a version")
             check_original_requirements_resolvable
             # If the original requirements are resolvable but we get an
-            # incompatibility update after unlocking then it's likely to be
+            # incompatibility error after unlocking then it's likely to be
             # due to problems with pip-compile's cascading resolution
             return nil
           end

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

@@ -72,6 +72,8 @@ module Dependabot
               updated_lockfile = TomlRB.parse(updated_lockfile)
 
               fetch_version_from_parsed_lockfile(updated_lockfile)
+            rescue SharedHelpers::HelperSubprocessFailed => error
+              handle_poetry_errors(error)
             end
           return unless @latest_resolvable_version_string
 
@@ -89,6 +91,36 @@ module Dependabot
           raise "No version in lockfile!"
         end
 
+        def handle_poetry_errors(error)
+          if error.message.include?("SolverProblemError")
+            check_original_requirements_resolvable
+          end
+
+          raise
+        end
+
+        def check_original_requirements_resolvable
+          SharedHelpers.in_a_temporary_directory do
+            write_temporary_dependency_files(update_pyproject: false)
+
+            run_poetry_command(
+              "pyenv exec poetry update #{dependency.name} --lock"
+            )
+
+            true
+          rescue SharedHelpers::HelperSubprocessFailed => error
+            raise unless error.message.include?("SolverProblemError")
+
+            msg = clean_error_message(error.message)
+            raise DependencyFileNotResolvable, msg
+          end
+        end
+
+        def clean_error_message(message)
+          # Redact any URLs, as they may include credentials
+          message.gsub(/http.*?(?=\s)/, "<redacted>")
+        end
+
         def write_temporary_dependency_files(update_pyproject: true)
           dependency_files.each do |file|
             path = file.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.93.14
+  version: 0.93.15
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.93.14
+        version: 0.93.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.93.14
+        version: 0.93.15
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement