dependabot-python 0.107.20 → 0.107.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9d84df98343502c47ab84ddf0dedf7b08e5339551a3f20b9510136b2ce6390
-  data.tar.gz: 9ba0f0349b9c4e05991cec50b518cd6d6f38fe0076234653f9eb1c22d080c73e
+  metadata.gz: f80d314bccb00e320686af91f27056546232832a23d2128c22007157dc1d0722
+  data.tar.gz: abd75d31672f1c3ef2c36990dfbc3d5d29a2cb156c4f7f21db5bc31a6bfab60e
 SHA512:
-  metadata.gz: 3243e53611d53ac5b7538ad7587d0a94c2f16c6e418887101f18379032ac7f53ca11c213b9f13daf2bfa633665cda9eeb3611ac81c3b7786c55ea28a4756ee23
-  data.tar.gz: 68a089715fea98b5ef2efe3c3832684055bf8f64893838263efbbeafb073296708526d77e5ac87e3ee59eef6cb5e3cf2aa0c519a3808eda34b04a258e7ed28d0
+  metadata.gz: d161b7c91490b0ceeef3c769a0d7e02161aff27cb0de4f12640a1e7c290a5c32c90c020ec321a183760f67b96bbd465bcbedd2e8baa9798a7fd3588cb814b4bb
+  data.tar.gz: 1fe08001613a0eed45d6c4e9328f81d0f78b5fba6852cfed26b3f964a624877b188e1dd095768cb1bb9ef5a208b350c9eaf0996035f38749cb90a28c5031dfff

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

@@ -172,14 +172,10 @@ module Dependabot
           run_command("pyenv local #{python_version}")
           run_command(command)
         rescue SharedHelpers::HelperSubprocessFailed => e
-          original_error ||= e
+          original_err ||= e
           msg = e.message
 
-          relevant_error =
-            if error_suggests_bad_python_version?(msg) then original_error
-            else e
-            end
-
+          relevant_error = choose_relevant_error(original_err, e)
           raise relevant_error unless error_suggests_bad_python_version?(msg)
           raise relevant_error if user_specified_python_version
           raise relevant_error if python_version == "2.7.16"
@@ -191,6 +187,25 @@ module Dependabot
           FileUtils.remove_entry(".python-version", true)
         end
 
+        def choose_relevant_error(previous_error, new_error)
+          return previous_error if previous_error == new_error
+
+          # If the previous error was definitely due to using the wrong Python
+          # version, return the new error (which can't be worse)
+          if error_certainly_bad_python_version?(previous_error.message)
+            return new_error
+          end
+
+          # Otherwise, if the new error may be due to using the wrong Python
+          # version, return the old error (which can't be worse)
+          if error_suggests_bad_python_version?(new_error.message)
+            return previous_error
+          end
+
+          # Otherwise, default to the new error
+          new_error
+        end
+
         def python_env
           env = {}
 
@@ -206,6 +221,14 @@ module Dependabot
           env
         end
 
+        def error_certainly_bad_python_version?(message)
+          unless message.include?('Command "python setup.py egg_info" failed')
+            return false
+          end
+
+          message.include?("SyntaxError")
+        end
+
         def error_suggests_bad_python_version?(message)
           return true if message.include?("not find a version that satisfies")
           return true if message.include?("No matching distribution found")

metadata

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