dependabot-python 0.106.29 → 0.106.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9a9b878f32b9f61d96f268e5bc09ad2b96dae5437e93fc51f64af14d937c412
-  data.tar.gz: ad007a266ed387a88549a613516edffa3f38fef736324ba0048b1c2a2fa18b30
+  metadata.gz: 9815a164c54336ff2535c3dad743bc5485fe4b77331567e6538091fd3435ef67
+  data.tar.gz: 60930b83e4d7159669e9e81f794030ccdaa934fedcce290ca01d82824cff2523
 SHA512:
-  metadata.gz: 7d2d327a80a060cc7b59848a35881772840e167716d56b2c162a3fce644e0d6670739e5aeda72578c97a58773aa5ed0d1f645c84851902edd3f9736ccc69289f
-  data.tar.gz: 2fe1c1638688eb095753bb220005d686d626238a8bebaeffa4769e97a399767f0b4b6e9483b496c1d76133d12bf39fa3bce5f6c39c6798a84160345f71a3a653
+  metadata.gz: ec6047e8104e46f95cd4a401311baed1c5e09e08f45d151b8346209e1c67c8fe845540b861c785a53d61fa2773579c5eea5c6da205388f1f729820ccb8e402a8
+  data.tar.gz: 4e51c3e3a82974ba0b20af09b0349e1ffd65980ca326e80ebfad2f11642da1e8127ba144cf06352d03e620e7580baeaf5c042e585365fe39e27e782f697cbf70

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

@@ -550,6 +550,7 @@ module Dependabot
           # (e.g., Django 2.x implies Python 3)
           @python_version ||=
             user_specified_python_version ||
+            python_version_from_compiled_requirements ||
             PythonVersions::PRE_INSTALLED_PYTHON_VERSIONS.first
         end
 
@@ -569,6 +570,34 @@ module Dependabot
           runtime_file.content.match(/(?<=python-).*/)&.to_s&.strip
         end
 
+        def python_version_from_compiled_requirements
+          PythonVersions::SUPPORTED_VERSIONS_TO_ITERATE.find do |version_string|
+            version = Python::Version.new(version_string)
+            compiled_file_python_requirement_markers.all? do |req|
+              req.satisfied_by?(version)
+            end
+          end
+        end
+
+        def compiled_file_python_requirement_markers
+          @python_requirement_strings ||=
+            compiled_files.flat_map do |file|
+              file.content.lines.
+                select { |l| l.include?(";") && l.include?("python") }.
+                map { |l| l.match(/python_version(?<req>.*?["'].*?['"])/) }.
+                compact.
+                map { |re| re.named_captures.fetch("req").gsub(/['"]/, "") }.
+                select do |r|
+                  requirement_class.new(r)
+                  true
+                rescue Gem::Requirement::BadRequirementError
+                  false
+                end
+            end
+
+          @python_requirement_strings.map { |r| requirement_class.new(r) }
+        end
+
         def pyenv_versions
           @pyenv_versions ||= run_command("pyenv install --list")
         end
@@ -585,6 +614,10 @@ module Dependabot
           dependency_files.select { |f| f.name.end_with?(".in") }
         end
 
+        def compiled_files
+          dependency_files.select { |f| f.name.end_with?(".txt") }
+        end
+
         def setup_cfg_files
           dependency_files.select { |f| f.name.end_with?("setup.cfg") }
         end
@@ -596,6 +629,10 @@ module Dependabot
         def runtime_file
           dependency_files.find { |f| f.name.end_with?("runtime.txt") }
         end
+
+        def requirement_class
+          Python::Requirement
+        end
       end
       # rubocop:enable Metrics/ClassLength
     end

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

@@ -438,6 +438,7 @@ module Dependabot
           # (e.g., Django 2.x implies Python 3)
           @python_version ||=
             user_specified_python_version ||
+            python_version_matching_requirements ||
             PythonVersions::PRE_INSTALLED_PYTHON_VERSIONS.first
         end
 
@@ -457,6 +458,34 @@ module Dependabot
           runtime_file.content.match(/(?<=python-).*/)&.to_s&.strip
         end
 
+        def python_version_matching_requirements
+          PythonVersions::SUPPORTED_VERSIONS_TO_ITERATE.find do |version_string|
+            version = Python::Version.new(version_string)
+            compiled_file_python_requirement_markers.all? do |req|
+              req.satisfied_by?(version)
+            end
+          end
+        end
+
+        def compiled_file_python_requirement_markers
+          @python_requirement_strings ||=
+            compiled_files.flat_map do |file|
+              file.content.lines.
+                select { |l| l.include?(";") && l.include?("python") }.
+                map { |l| l.match(/python_version(?<req>.*?["'].*?['"])/) }.
+                compact.
+                map { |re| re.named_captures.fetch("req").gsub(/['"]/, "") }.
+                select do |r|
+                  requirement_class.new(r)
+                  true
+                rescue Gem::Requirement::BadRequirementError
+                  false
+                end
+            end
+
+          @python_requirement_strings.map { |r| requirement_class.new(r) }
+        end
+
         def pyenv_versions
           @pyenv_versions ||= run_command("pyenv install --list")
         end
@@ -473,6 +502,10 @@ module Dependabot
           dependency_files.select { |f| f.name.end_with?(".in") }
         end
 
+        def compiled_files
+          dependency_files.select { |f| f.name.end_with?(".txt") }
+        end
+
         def setup_cfg_files
           dependency_files.select { |f| f.name.end_with?("setup.cfg") }
         end
@@ -484,6 +517,10 @@ module Dependabot
         def runtime_file
           dependency_files.find { |f| f.name.end_with?("runtime.txt") }
         end
+
+        def requirement_class
+          Python::Requirement
+        end
       end
       # rubocop:enable Metrics/ClassLength
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.106.29
+  version: 0.106.30
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-03 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.106.29
+        version: 0.106.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.106.29
+        version: 0.106.30
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement