dependabot-python 0.95.54 → 0.95.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f22700f2b7bb90f947e612663e7804dcbc3f1204d0755d199b956248f39723
-  data.tar.gz: 30e4c2db194af67f082d90f00f44ff2b71744fd83a49482c655cc0489be22626
+  metadata.gz: fa4c36a5edfef2e030d8a2a0ef9fba45c033fe49a69bc35d633617b552dcc0fc
+  data.tar.gz: 228f9bca574583710c4175eb963911be3ae534d4d5260250ce718dadcf1e7e53
 SHA512:
-  metadata.gz: 38dc4824a6195dbe0b672e51e4bdb19c66130fb07f0d82ee2c9cdcdf458af1b7846fed377243fe6ae9f3eec1c6abe2bd0701c9a8cd559ec80a949aa5e5071b9d
-  data.tar.gz: cd1eb2935c0955bdb30586589b980e6884bc8fa63c7c472eb0406cf1666065841af77907044bba4982eaf16349f07b804c28248aa5c17ce75d2491260d10c744
+  metadata.gz: 7faac2287e48dd8ec444516847d261616f31416aee54ac3d4d0c7c0985e0a38626793abebb75bf5bf0868de38e064186a180516ac2e2738b7d429adf16843002
+  data.tar.gz: 001a51d1416b8009de478bb768d4875904388a03a453f0a93ae41e8dfcb6f86fc0084fb55f08a8b13079f7368517652100a8a0a00130b3dbc9b35f216b0f40f4

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

@@ -6,6 +6,7 @@ require "dependabot/python/file_fetcher"
 require "dependabot/python/file_updater"
 require "dependabot/shared_helpers"
 require "dependabot/python/native_helpers"
+require "dependabot/python/python_versions"
 
 # rubocop:disable Metrics/ClassLength
 module Dependabot
@@ -57,22 +58,26 @@ module Dependabot
         def compile_new_requirement_files
           SharedHelpers.in_a_temporary_directory do
             write_updated_dependency_files
+            install_required_python
 
             filenames_to_compile.each do |filename|
               # Shell out to pip-compile, generate a new set of requirements.
               # This is slow, as pip-compile needs to do installs.
-              run_command(
+              run_pip_compile_command(
                 "pyenv exec pip-compile #{pip_compile_options(filename)} "\
                 "-P #{dependency.name}==#{dependency.version} #{filename}"
               )
               # Run pip-compile a second time, without an update argument, to
               # ensure it resets the right comments.
-              run_command(
+              run_pip_compile_command(
                 "pyenv exec pip-compile #{pip_compile_options(filename)} "\
                 "#{filename}"
               )
             end
 
+            # Remove any .python-version file before parsing the reqs
+            FileUtils.remove_entry(".python-version", true)
+
             dependency_files.map do |file|
               next unless file.name.end_with?(".txt")
 
@@ -124,7 +129,6 @@ module Dependabot
           ).updated_dependency_files
         end
 
-        # rubocop:disable Metrics/MethodLength
         def run_command(command)
           command = command.dup
           env_cmd = [python_env, command].compact
@@ -132,9 +136,7 @@ module Dependabot
           stdout, process = Open3.capture2e(*env_cmd)
           time_taken = Time.now - start
 
-          # Raise an error with the output from the shell session if
-          # pip-compile returns a non-zero status
-          return if process.success?
+          return stdout if process.success?
 
           raise SharedHelpers::HelperSubprocessFailed.new(
             message: stdout,
@@ -144,6 +146,11 @@ module Dependabot
               process_exit_value: process.to_s
             }
           )
+        end
+
+        def run_pip_compile_command(command)
+          local_command = "pyenv local #{python_version} && " + command
+          run_command(local_command)
         rescue SharedHelpers::HelperSubprocessFailed => error
           original_error ||= error
           msg = error.message
@@ -154,14 +161,15 @@ module Dependabot
             end
 
           raise relevant_error unless error_suggests_bad_python_version?(msg)
-          raise relevant_error if File.exist?(".python-version")
+          raise relevant_error if user_specified_python_version
+          raise relevant_error if python_version == "2.7.15"
 
-          command = "pyenv local 2.7.15 && " + command
+          @python_version = "2.7.15"
           retry
         ensure
+          @python_version = nil
           FileUtils.remove_entry(".python-version", true)
         end
-        # rubocop:enable Metrics/MethodLength
 
         def python_env
           env = {}
@@ -186,13 +194,14 @@ module Dependabot
 
         def write_updated_dependency_files
           dependency_files.each do |file|
-            next if file.name == ".python-version"
-
             path = file.name
             FileUtils.mkdir_p(Pathname.new(path).dirname)
             File.write(path, freeze_dependency_requirement(file))
           end
 
+          # Overwrite the .python-version with updated content
+          File.write(".python-version", python_version) if python_version
+
           setup_files.each do |file|
             path = file.name
             FileUtils.mkdir_p(Pathname.new(path).dirname)
@@ -206,6 +215,15 @@ module Dependabot
           end
         end
 
+        def install_required_python
+          if python_version &&
+             !run_command("pyenv versions").include?(python_version)
+            run_command("pyenv install -s")
+            run_command("pyenv exec pip install -r " + \
+                        NativeHelpers.python_requirements_path)
+          end
+        end
+
         def sanitized_setup_file_content(file)
           @sanitized_setup_file_content ||= {}
           if @sanitized_setup_file_content[file.name]
@@ -475,6 +493,22 @@ module Dependabot
             end
         end
 
+        def python_version
+          # TODO: Add better Python version detection using dependency versions
+          # (e.g., Django 2.x implies Python 3)
+          @python_version ||=
+            user_specified_python_version ||
+            PythonVersions::PRE_INSTALLED_PYTHON_VERSIONS.first
+        end
+
+        def user_specified_python_version
+          python_version_file&.content&.strip
+        end
+
+        def pre_installed_python?(version)
+          PythonVersions::PRE_INSTALLED_PYTHON_VERSIONS.include?(version)
+        end
+
         def setup_files
           dependency_files.select { |f| f.name.end_with?("setup.py") }
         end
@@ -486,6 +520,10 @@ module Dependabot
         def setup_cfg_files
           dependency_files.select { |f| f.name.end_with?("setup.cfg") }
         end
+
+        def python_version_file
+          dependency_files.find { |f| f.name == ".python-version" }
+        end
       end
     end
   end

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

@@ -10,6 +10,7 @@ require "dependabot/python/file_updater/setup_file_sanitizer"
 require "dependabot/python/version"
 require "dependabot/shared_helpers"
 require "dependabot/python/native_helpers"
+require "dependabot/python/python_versions"
 
 # rubocop:disable Metrics/ClassLength
 module Dependabot
@@ -52,16 +53,18 @@ module Dependabot
             SharedHelpers.in_a_temporary_directory do
               SharedHelpers.with_git_configured(credentials: credentials) do
                 write_temporary_dependency_files
+                install_required_python
 
                 filenames_to_compile.each do |filename|
                   # Shell out to pip-compile.
                   # This is slow, as pip-compile needs to do installs.
-                  cmd = "pyenv exec pip-compile --allow-unsafe "\
-                        "-P #{dependency.name} #{filename}"
-                  run_command(cmd)
+                  run_pip_compile_command(
+                    "pyenv exec pip-compile --allow-unsafe "\
+                    "-P #{dependency.name} #{filename}"
+                  )
                   # Run pip-compile a second time, without an update argument,
                   # to ensure it handles markers correctly
-                  run_command(
+                  run_pip_compile_command(
                     "pyenv exec pip-compile --allow-unsafe #{filename}"
                   )
                 end
@@ -139,7 +142,6 @@ module Dependabot
           end
         end
 
-        # rubocop:disable Metrics/MethodLength
         def run_command(command)
           command = command.dup
           env_cmd = [python_env, command].compact
@@ -147,9 +149,7 @@ module Dependabot
           stdout, process = Open3.capture2e(*env_cmd)
           time_taken = Time.now - start
 
-          # Raise an error with the output from the shell session if
-          # pip-compile returns a non-zero status
-          return if process.success?
+          return stdout if process.success?
 
           raise SharedHelpers::HelperSubprocessFailed.new(
             message: stdout,
@@ -159,6 +159,11 @@ module Dependabot
               process_exit_value: process.to_s
             }
           )
+        end
+
+        def run_pip_compile_command(command)
+          local_command = "pyenv local #{python_version} && " + command
+          run_command(local_command)
         rescue SharedHelpers::HelperSubprocessFailed => error
           original_error ||= error
           msg = error.message
@@ -169,14 +174,15 @@ module Dependabot
             end
 
           raise relevant_error unless error_suggests_bad_python_version?(msg)
-          raise relevant_error if File.exist?(".python-version")
+          raise relevant_error if user_specified_python_version
+          raise relevant_error if python_version == "2.7.15"
 
-          command = "pyenv local 2.7.15 && " + command
+          @python_version = "2.7.15"
           retry
         ensure
+          @python_version = nil
           FileUtils.remove_entry(".python-version", true)
         end
-        # rubocop:enable Metrics/MethodLength
 
         def python_env
           env = {}
@@ -202,8 +208,6 @@ module Dependabot
 
         def write_temporary_dependency_files(unlock_requirement: true)
           dependency_files.each do |file|
-            next if file.name == ".python-version"
-
             path = file.name
             FileUtils.mkdir_p(Pathname.new(path).dirname)
             File.write(
@@ -212,6 +216,9 @@ module Dependabot
             )
           end
 
+          # Overwrite the .python-version with updated content
+          File.write(".python-version", python_version) if python_version
+
           setup_files.each do |file|
             path = file.name
             FileUtils.mkdir_p(Pathname.new(path).dirname)
@@ -225,6 +232,15 @@ module Dependabot
           end
         end
 
+        def install_required_python
+          if python_version &&
+             !run_command("pyenv versions").include?(python_version)
+            run_command("pyenv install -s")
+            run_command("pyenv exec pip install -r " + \
+                        NativeHelpers.python_requirements_path)
+          end
+        end
+
         def sanitized_setup_file_content(file)
           @sanitized_setup_file_content ||= {}
           if @sanitized_setup_file_content[file.name]
@@ -384,6 +400,22 @@ module Dependabot
           ).parse.find { |d| d.name == dependency.name }&.version
         end
 
+        def python_version
+          # TODO: Add better Python version detection using dependency versions
+          # (e.g., Django 2.x implies Python 3)
+          @python_version ||=
+            user_specified_python_version ||
+            PythonVersions::PRE_INSTALLED_PYTHON_VERSIONS.first
+        end
+
+        def user_specified_python_version
+          python_version_file&.content&.strip
+        end
+
+        def pre_installed_python?(version)
+          PythonVersions::PRE_INSTALLED_PYTHON_VERSIONS.include?(version)
+        end
+
         def setup_files
           dependency_files.select { |f| f.name.end_with?("setup.py") }
         end
@@ -395,6 +427,10 @@ module Dependabot
         def setup_cfg_files
           dependency_files.select { |f| f.name.end_with?("setup.cfg") }
         end
+
+        def python_version_file
+          dependency_files.find { |f| f.name == ".python-version" }
+        end
       end
     end
   end

metadata

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