dependabot-python 0.95.80 → 0.95.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 529c50b65896f69cc0796d216923e66541e38707a14b5f244ab07c0e285b3c92
-  data.tar.gz: 17ac3455d0964e77a589267f3ade1523915015beb637de782aee82cab7d19924
+  metadata.gz: 83506e2638dd2782f7827dd0526440ccf471388cce24f3482f944ea64d9542d2
+  data.tar.gz: a0f14cd485362c3327b474e39b54fe27b47340c4c757183a12e36fe13a69c3a0
 SHA512:
-  metadata.gz: d8eda4e16375148cdb511a56d6a602dede71c80f15c732e0d1281118841a83f97e3b82ce4b11626beb189b7bbd18e1ce2776e93e80587a88e25b5935ed1176db
-  data.tar.gz: '08ab746aa6449328c7388bae0509fe3277cccb2c21bbb46fa4b3cd33e41d721cc7583cf2491295371b50ea01680dc7a19498e9fadb405d260ae39a443a2385f4'
+  metadata.gz: 90032f3e3f0842292b7fb9f93c68a04ddcc6bc2c8bb50756410adc3d451ad7e932c87c5572ec6baca707b7827f436b9b67dd0a1eaff76b5c848f1fcad4d8d1d7
+  data.tar.gz: 394ad654c9d1c28840e6df8c35ebc76812edf9a47595fada501d09b449beccfc2291ab0132372254e9ec23c9a5ebeaa961e9e577d441fd0314e5e6240f7050ae

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

@@ -158,12 +158,12 @@ module Dependabot
           end
 
           if error.message.include?("UnsupportedPythonVersion") &&
-             error.message.include?(dependency.name) &&
              user_specified_python_requirement
+            check_original_requirements_resolvable
+
             # The latest version of the dependency we're updating to needs a
             # different Python version. Skip the update.
-            check_original_requirements_resolvable
-            return
+            return if error.message.include?(dependency.name)
           end
 
           if error.message.match?(GIT_DEPENDENCY_UNREACHABLE_REGEX)
@@ -200,24 +200,39 @@ module Dependabot
 
               true
             rescue SharedHelpers::HelperSubprocessFailed => error
-              if error.message.include?("Could not find a version")
-                msg = clean_error_message(error.message)
-                msg.gsub!(/\s+\(from .*$/, "")
-                raise if msg.empty?
+              handle_pipenv_errors_resolving_original_reqs(error)
+            end
+          end
+        end
 
-                raise DependencyFileNotResolvable, msg
-              end
+        def handle_pipenv_errors_resolving_original_reqs(error)
+          if error.message.include?("Could not find a version")
+            msg = clean_error_message(error.message)
+            msg.gsub!(/\s+\(from .*$/, "")
+            raise if msg.empty?
 
-              if error.message.include?("is not a python version")
-                msg = "Pipenv does not support specifying Python ranges "\
-                  "(see https://github.com/pypa/pipenv/issues/1050 for more "\
-                  "details)."
-                raise DependencyFileNotResolvable, msg
-              end
+            raise DependencyFileNotResolvable, msg
+          end
 
-              raise
-            end
+          if error.message.include?("is not a python version")
+            msg = "Pipenv does not support specifying Python ranges "\
+              "(see https://github.com/pypa/pipenv/issues/1050 for more "\
+              "details)."
+            raise DependencyFileNotResolvable, msg
           end
+
+          if error.message.include?("UnsupportedPythonVersion") &&
+             user_specified_python_requirement
+            msg = clean_error_message(error.message).
+                  lines.take_while { |l| !l.start_with?("File") }.join.strip
+            raise if msg.empty?
+
+            raise DependencyFileNotResolvable, msg
+          end
+
+          # Raise an unhandled error, as this could be a problem with
+          # Dependabot's infrastructure, rather than the Pipfile
+          raise
         end
 
         def clean_error_message(message)
@@ -230,6 +245,7 @@ module Dependabot
                   next false if l.start_with?("CRITICAL:")
                   next false if l.start_with?("ERROR:")
                   next false if l.start_with?("packaging.specifiers")
+                  next false if l.start_with?("pipenv.patched.notpip._internal")
                   next false if l.include?("Max retries exceeded")
 
                   true

metadata

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