dependabot-python 0.160.0 → 0.162.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efccedc287dfb35ca74be16cd3510e9c328ef66815f0b69376426d18f8abacbf
-  data.tar.gz: 19b54cc583987fd14d9e8e6ba4a7d8b6fcfab8979cbf2893bb631c48ff84c808
+  metadata.gz: a68b3ad8560b0bfba2c04ac116159ea28a9dc3009f2d27213cb7b00adac87b2a
+  data.tar.gz: ede45edab4b38123fcdc856fc7f1eabc125ba5ffd5b0cad309d39b8dcb770c91
 SHA512:
-  metadata.gz: ab80a99556215eaa2c4981ef0424c432fe91917a4207ad3b8dad62aa6c2fedb7287673ae6abc23f80fe59ac8b6d9a0eddbce0be67647fdeb35f3092d764af63b
-  data.tar.gz: ab6f92abd351e92bf7d36a74c4014c0a48e09d5d4c4341282c389cd5d82a6bd40680203d2e347751675e1f87759370757855741eff65ea48ed24b1466f1722e1
+  metadata.gz: d0d9737ee371902eff0912dbac6a73aaeec6287cb5d85611d5c8f75887611c4ec8273175e3f01607eff6489e2264c40d3bd413af30c7790df4756124f1da99ed
+  data.tar.gz: 5e0b31390c059a412d090c544932a039ae26ab2547a33987cc23fc6234051b8106969ea8835478bb6dab303e601c68f7422547c35dcf75932eb1170c06ba844c

data/helpers/build

@@ -16,9 +16,9 @@ cp -r \
   "$install_dir"
 
 cd "$install_dir"
-PYENV_VERSION=3.9.6  pyenv exec pip install -r "requirements.txt"
+PYENV_VERSION=3.9.7  pyenv exec pip install -r "requirements.txt"
 
 # Workaround of https://github.com/python-poetry/poetry/issues/3010
 # By default poetry config file is stored under ~/.config/pypoetry
 # and is not bound to any specific Python version
-PYENV_VERSION=3.9.6 pyenv exec poetry config experimental.new-installer false
+PYENV_VERSION=3.9.7 pyenv exec poetry config experimental.new-installer false

data/lib/dependabot/python/file_parser/poetry_files_parser.rb

@@ -43,28 +43,38 @@ module Dependabot
 
             deps_hash.each do |name, req|
               next if normalise(name) == "python"
-              next if req.is_a?(Hash) && UNSUPPORTED_DEPENDENCY_TYPES.any? { |t| req.key?(t) }
-
-              check_requirements(req)
-
-              dependencies <<
-                Dependency.new(
-                  name: normalise(name),
-                  version: version_from_lockfile(name),
-                  requirements: [{
-                    requirement: req.is_a?(String) ? req : req["version"],
-                    file: pyproject.name,
-                    source: nil,
-                    groups: [type]
-                  }],
-                  package_manager: "pip"
-                )
+
+              requirements = parse_requirements_from(req, type)
+              next if requirements.empty?
+
+              dependencies << Dependency.new(
+                name: normalise(name),
+                version: version_from_lockfile(name),
+                requirements: requirements,
+                package_manager: "pip"
+              )
             end
           end
 
           dependencies
         end
 
+        # @param req can be an Array, Hash or String that represents the constraints for a dependency
+        def parse_requirements_from(req, type)
+          [req].flatten.compact.map do |requirement|
+            next if requirement.is_a?(Hash) && (UNSUPPORTED_DEPENDENCY_TYPES & requirement.keys).any?
+
+            check_requirements(requirement)
+
+            {
+              requirement: requirement.is_a?(String) ? requirement : requirement["version"],
+              file: pyproject.name,
+              source: nil,
+              groups: [type]
+            }
+          end.compact
+        end
+
         # Create a DependencySet where each element has no requirement. Any
         # requirements will be added when combining the DependencySet with
         # other DependencySets.

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

@@ -22,6 +22,7 @@ module Dependabot
         require_relative "setup_file_sanitizer"
 
         UNSAFE_PACKAGES = %w(setuptools distribute pip).freeze
+        INCOMPATIBLE_VERSIONS_REGEX = /There are incompatible versions in the resolved dependencies:.*\z/m.freeze
         WARNINGS = /\s*# WARNING:.*\Z/m.freeze
         UNSAFE_NOTE =
           /\s*# The following packages are considered to be unsafe.*\Z/m.freeze
@@ -154,12 +155,20 @@ module Dependabot
 
           return stdout if process.success?
 
+          handle_pip_errors(stdout, command, time_taken, process.to_s)
+        end
+
+        def handle_pip_errors(stdout, command, time_taken, exit_value)
+          if stdout.match?(INCOMPATIBLE_VERSIONS_REGEX)
+            raise DependencyFileNotResolvable, stdout.match(INCOMPATIBLE_VERSIONS_REGEX)
+          end
+
           raise SharedHelpers::HelperSubprocessFailed.new(
             message: stdout,
             error_context: {
               command: command,
               time_taken: time_taken,
-              process_exit_value: process.to_s
+              process_exit_value: exit_value
             }
           )
         end

data/lib/dependabot/python/python_versions.rb

@@ -4,14 +4,14 @@ module Dependabot
   module Python
     module PythonVersions
       PRE_INSTALLED_PYTHON_VERSIONS = %w(
-        3.9.6
+        3.9.7
       ).freeze
 
       # Due to an OpenSSL issue we can only install the following versions in
       # the Dependabot container.
       SUPPORTED_VERSIONS = %w(
-        3.9.6 3.9.5 3.9.4 3.9.3 3.9.2 3.9.1 3.9.0
-        3.8.11 3.8.10 3.8.9 3.8.8 3.8.7 3.8.6 3.8.5 3.8.4 3.8.3 3.8.2 3.8.1 3.8.0
+        3.9.7 3.9.6 3.9.5 3.9.4 3.9.2 3.9.1 3.9.0
+        3.8.12 3.8.11 3.8.10 3.8.9 3.8.8 3.8.7 3.8.6 3.8.5 3.8.4 3.8.3 3.8.2 3.8.1 3.8.0
         3.7.11 3.7.10 3.7.9 3.7.8 3.7.7 3.7.6 3.7.5 3.7.4 3.7.3 3.7.2 3.7.1 3.7.0
         3.6.14 3.6.13 3.6.12 3.6.11 3.6.10 3.6.9 3.6.8 3.6.7 3.6.6 3.6.5 3.6.4 3.6.3
         3.6.2 3.6.1 3.6.0 3.5.10 3.5.8 3.5.7 3.5.6 3.5.5 3.5.4 3.5.3

metadata

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