dependabot-python 0.111.28 → 0.111.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d8b6adc1f2d136a92dbf6980f1fb0e2402ee04d8671e067c017fdef952b727d
-  data.tar.gz: c05e90c49c095f40c32950ce894cf8131fea9e11708b228c455a5b6eed8fd859
+  metadata.gz: 6f8dc5b6e1d845d5c1467cccd50008bd29f55e6035b5cfd39a33fe1dff158565
+  data.tar.gz: e084ac294a4374a8939c2e28656df9a44c17eb78067d9b3b1c42ebd7f33aab15
 SHA512:
-  metadata.gz: de00b1055f33feda4ff3f6bba2a4111f0eb1d2003dc3c058a242ac66a9cc945706ca3f4bcdbb2b6e7c180086aed3602758cef322fae5a7023551399411eb749f
-  data.tar.gz: c83b4e3756d6817cb03dfa01cd8e1aeaa3933eed558136e206725101f9aa5682776b91fe244a99879963cd568f3aee2cf52760234b61cde71d19b0a27de83ae6
+  metadata.gz: 2be4aa683240cccfc362d97130f470c5b433520e0ad5d652d3ff2402423829b86a1c7560233dc4fdf338fb297c3c75cd6aa3957ee6149d306b225e2fac37b1cb
+  data.tar.gz: 59a36e3c75049c4971a3e989439a2228fdc9d75f122693c1649f9ff1a4616185b6fb19c561f465689a43cf058e51e76e4e82f72ca7feac405503c9f831de3b25

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

@@ -24,9 +24,9 @@ module Dependabot
       # rubocop:disable Metrics/ClassLength
       class PipCompileVersionResolver
         GIT_DEPENDENCY_UNREACHABLE_REGEX =
-          /Command "git clone -q (?<url>[^\s]+).*" failed/.freeze
+          /git clone -q (?<url>[^\s]+).* /.freeze
         GIT_REFERENCE_NOT_FOUND_REGEX =
-          %r{"git checkout -q (?<tag>[^"]+)" .*/(?<name>.*?)(\\n'\]|$)}.
+          %r{git checkout -q (?<tag>[^\n"]+)\n?[^\n]*/(?<name>.*?)(\\n'\]|$)}m.
           freeze
 
         attr_reader :dependency, :dependency_files, :credentials
@@ -117,11 +117,11 @@ module Dependabot
             check_original_requirements_resolvable
           end
 
-          if error.message.include?('Command "python setup.py egg_info') &&
-             error.message.match?(/#{Regexp.quote(dependency.name)}/i)
+          if error.message.include?('Command "python setup.py egg_info') ||
+             error.message.include?("exit status 1: python setup.py egg_info")
             # The latest version of the dependency we're updating is borked
             # (because it has an unevaluatable setup.py). Skip the update.
-            return nil
+            return if check_original_requirements_resolvable
           end
 
           if error.message.include?("Could not find a version ") &&

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

@@ -31,9 +31,9 @@ module Dependabot
       # still better than nothing, though.
       class PipenvVersionResolver
         GIT_DEPENDENCY_UNREACHABLE_REGEX =
-          /Command "git clone -q (?<url>[^\s]+).*" failed/.freeze
+          /git clone -q (?<url>[^\s]+).* /.freeze
         GIT_REFERENCE_NOT_FOUND_REGEX =
-          %r{"git checkout -q (?<tag>[^"]+)" .*/(?<name>.*?)(\\n'\]|$)}.
+          %r{git checkout -q (?<tag>[^\n"]+)\n?[^\n]*/(?<name>.*?)(\\n'\]|$)}m.
           freeze
         UNSUPPORTED_DEPS = %w(pyobjc).freeze
         UNSUPPORTED_DEP_REGEX =
@@ -152,11 +152,11 @@ module Dependabot
             check_original_requirements_resolvable
           end
 
-          if error.message.include?('Command "python setup.py egg_info"') &&
-             error.message.match?(/#{Regexp.quote(dependency.name)}/i)
+          if error.message.include?('Command "python setup.py egg_info"') ||
+             error.message.include?("exit status 1: python setup.py egg_info")
             # The latest version of the dependency we're updating is borked
             # (because it has an unevaluatable setup.py). Skip the update.
-            return nil
+            return if check_original_requirements_resolvable
           end
 
           if error.message.include?("UnsupportedPythonVersion") &&
@@ -168,6 +168,7 @@ module Dependabot
             return if error.message.match?(/#{Regexp.quote(dependency.name)}/i)
           end
 
+          puts error.message
           if error.message.match?(GIT_DEPENDENCY_UNREACHABLE_REGEX)
             url = error.message.match(GIT_DEPENDENCY_UNREACHABLE_REGEX).
                   named_captures.fetch("url")
@@ -469,7 +470,7 @@ module Dependabot
           return true if error_message.include?("at matches #{dependency.name}")
 
           error_message.include?('Command "python setup.py egg_info" failed') ||
-            message.include?("exit status 1: python setup.py egg_info")
+            error_message.include?("exit status 1: python setup.py egg_info")
         end
 
         def pipenv_env_variables

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.111.28
+  version: 0.111.29
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.111.28
+        version: 0.111.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.111.28
+        version: 0.111.29
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement