dependabot-python 0.166.1 → 0.169.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1fe31e0c62f6553ad83d2e5489199ac6568c04eecf91b57ab96d5a6689d0b3d
-  data.tar.gz: fb34d57c76465b2c3f1077e9d103932e4092fdd6ef0aee52ac9b942504210287
+  metadata.gz: 491d235ce8877b0da3a7de048d9ec6cb38b89f8898c46f5a07760900d6b8bcc8
+  data.tar.gz: 0b0434fe1caa2459cdd3ba3cb9aff518c63697b0ffbe1f9128858c6e1839f26d
 SHA512:
-  metadata.gz: 9cab3be85a185dea4a2e6a11c03330770ec2474be5bfe78a4d26ae223ac968e40da8dc060747ed26f380a74a4ec76993fdb347f1f87ac7a9ad15028f0fb7c68f
-  data.tar.gz: ba07d7aee8a862e31d04a6d671916c47ae1103b76e8daecf2150b16f1d32b75d3050fb45b3f7a6cb43140b3b376d074b89db3fccbab983c10f80188a3bc26e54
+  metadata.gz: 314e6788ad67e4c9a7021c4ee3ee3292418ec6619cca1be069b7c63712f73ed6fe742a5408859466d040532093fd10edd2c734d860eb02f32e71f9f5d50c6210
+  data.tar.gz: 0d011a883b921c37d728b1510904f0a382e5ca043b21539119cfea4dff5e3318687141a9cf4a8c48b39c9041a039123474b3af9199fa9d8ba39005a13a3f4733

data/helpers/requirements.txt

@@ -1,10 +1,10 @@
-pip==21.2.4
+pip==21.3.1
 pip-tools==6.4.0
 flake8==4.0.1
 hashin==0.15.0
-pipenv==2021.5.29
+pipenv==2021.11.23
 pipfile==0.0.2
-poetry==1.1.11
+poetry==1.1.12
 wheel==0.37.0
 
 # Some dependencies will only install if Cython is present

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/pip_compile_version_resolver.rb

@@ -25,7 +25,7 @@ module Dependabot
       # rubocop:disable Metrics/ClassLength
       class PipCompileVersionResolver
         GIT_DEPENDENCY_UNREACHABLE_REGEX =
-          /git clone -q (?<url>[^\s]+).* /.freeze
+          /git clone --filter=blob:none -q (?<url>[^\s]+).* /.freeze
         GIT_REFERENCE_NOT_FOUND_REGEX =
           /egg=(?<name>\S+).*.*WARNING: Did not find branch or tag \'(?<tag>[^\n"]+)\'/m.freeze
         NATIVE_COMPILATION_ERROR =

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.166.1
+  version: 0.169.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-14 00:00:00.000000000 Z
+date: 2021-11-29 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.166.1
+        version: 0.169.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.166.1
+        version: 0.169.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement