dependabot-python 0.167.0 → 0.168.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443e0251039b9e15270dbff347b618605784b28918301fd67d70101c1dce7721
-  data.tar.gz: 62518d3076b81d948eef00dc13937fa94c0f20fd61f28bef80e47ecf7d9f7f2f
+  metadata.gz: 9a97c2e03959cd5218e6bf5e8c15097ff1974e726dbcf2ad8016d3e1ddb7cb04
+  data.tar.gz: 00341d74c5e1cb57be6fed02b8d05a73df4cb433f159a83a38940abe3741c2e4
 SHA512:
-  metadata.gz: 41fa8d64868f49b15da75991dcd6ad21ebb46fa4683e3d5f4c03a842c8258633f521ab16faa17f5e52b2ac8484c157166caea58a111e5f63e34bc0c5d2f16a69
-  data.tar.gz: 7bed8de8b1c40c6e05fc84dce41e31ec44c47e91b6596dcbdd743ea25c765fd602108f843cd21846d3e3a4639b838417f2a605578ef7902df89efa39b0b3b83b
+  metadata.gz: f0b5c43bc734d2e12c814cd400bd4d4d6329e38693c125d83c2a3c1f9560bd3314e9af48a0bb68b585df3c865678ce3fa1711a76640c48e9086b766cf81a34bb
+  data.tar.gz: c62dbd6b560eac720d8c1adfed25bad4a56c41e6092c44303ae241b1e6ad0f4b9a3fc2fe5b7a36f90ebb9df32134b3f08087fa6725ed54fe737334a20022ab3b

data/helpers/requirements.txt

@@ -2,7 +2,7 @@ pip==21.2.4
 pip-tools==6.4.0
 flake8==4.0.1
 hashin==0.15.0
-pipenv==2021.5.29
+pipenv==2021.11.15
 pipfile==0.0.2
 poetry==1.1.11
 wheel==0.37.0

data/lib/dependabot/python/file_updater/pip_compile_file_updater.rb

@@ -430,6 +430,9 @@ module Dependabot
           options << "--no-header" unless requirements_file.content.include?("autogenerated by pip-c")
 
           options << "--pre" if requirements_file.content.include?("--pre")
+
+          options << "--strip-extras" if requirements_file.content.include?("--strip-extras")
+
           options
         end
 

data/lib/dependabot/python/file_updater/pyproject_preparer.rb

@@ -54,7 +54,7 @@ module Dependabot
 
               next unless (locked_version = locked_details&.fetch("version"))
 
-              next if locked_details&.dig("source", "type") == "directory"
+              next if %w(directory file url).include?(locked_details&.dig("source", "type"))
 
               if locked_details&.dig("source", "type") == "git"
                 poetry_object[key][dep_name] = {

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

@@ -40,7 +40,9 @@ module Dependabot
         PIPENV_INSTALLATION_ERROR_REGEX =
           /#{Regexp.quote(TRACEBACK)}[\s\S]*^\s+import\s(?<name>.+)[\s\S]*^#{Regexp.quote(PIPENV_INSTALLATION_ERROR)}/.
           freeze
-        UNSUPPORTED_DEP_REGEX = /(?:pyobjc)[\s\S]*#{Regexp.quote(PIPENV_INSTALLATION_ERROR)}/.freeze
+        UNSUPPORTED_DEPS = %w(pyobjc).freeze
+        UNSUPPORTED_DEP_REGEX =
+          /Could not find a version that satisfies the requirement.*(?:#{UNSUPPORTED_DEPS.join("|")})/.freeze
         PIPENV_RANGE_WARNING = /Warning:\sPython\s[<>].* was not found/.freeze
 
         attr_reader :dependency, :dependency_files, :credentials
@@ -62,11 +64,7 @@ module Dependabot
           @resolvable ||= {}
           return @resolvable[version] if @resolvable.key?(version)
 
-          @resolvable[version] = if fetch_latest_resolvable_version_string(requirement: "==#{version}")
-                                   true
-                                 else
-                                   false
-                                 end
+          @resolvable[version] = !!fetch_latest_resolvable_version_string(requirement: "==#{version}")
         end
 
         private
@@ -155,7 +153,9 @@ module Dependabot
             raise DependencyFileNotResolvable, msg
           end
 
-          check_original_requirements_resolvable if error.message.include?("Could not find a version")
+          if error.message.include?("Could not find a version") || error.message.include?("ResolutionFailure")
+            check_original_requirements_resolvable
+          end
 
           if error.message.include?("SyntaxError: invalid syntax")
             raise DependencyFileNotResolvable,
@@ -220,7 +220,8 @@ module Dependabot
         end
 
         def handle_pipenv_errors_resolving_original_reqs(error)
-          if error.message.include?("Could not find a version")
+          if error.message.include?("Could not find a version") ||
+             error.message.include?("package versions have conflicting dependencies")
             msg = clean_error_message(error.message)
             msg.gsub!(/\s+\(from .*$/, "")
             raise if msg.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.167.0
+  version: 0.168.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-23 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.167.0
+        version: 0.168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.167.0
+        version: 0.168.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement