dependabot-python 0.79.3 → 0.79.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9a3b1608cf8227ff8727277792c2dd7bb1332d9708f80dfc84bb41ee990957
-  data.tar.gz: bf4070fcebbef332f5fa83e88395ece8fbe8fcb6fe431bd7de072519d061c940
+  metadata.gz: 9b8342d75c717b59efb17606b4ee69390ea8769f125de9595208cf768c054da6
+  data.tar.gz: '06328512c3e119123e7028ac22f7a1519184862adf2762e3ec11cc5ea2a57083'
 SHA512:
-  metadata.gz: e12a48e5026a046a9631dffd80ee8fc628df8c6b81307babd297139e4c1ce01bcf1223f1a10eb28478dea20a8a9a83458a85d77f4bad64d5fbf8b805e9fc1f8a
-  data.tar.gz: 9f9f66904b72682f8cc37d8c9d8908922ef4f3218fe9814ef9415f6f3a5cff7f86eafb7f67d554c19f3772940f4cfb4dab847388f469060b60d98643b9aea1a5
+  metadata.gz: a161c47427d71935042ecd409d37fa2e79baed8083bd1720441cb37fadf55cc85ccaa3e34aff7835e57b67b0c029a28183d8c42475de97f49d0253e683fc774b
+  data.tar.gz: 9c7ceeb0486d8431f6f1130e1e3e6f601fe8d711f46556be844208245e4fee9ff352454a2f4d48ccb576f55f152e0105bc255594d8bf652d7a73046528f574b4

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

@@ -152,9 +152,8 @@ module Dependabot
             if python_version && !pre_installed_python?(python_version)
               run_poetry_command("pyenv install -s")
               run_poetry_command("pyenv exec pip install --upgrade pip")
-              run_poetry_command(
-                "pyenv exec pip install -r #{python_requirements_path}"
-              )
+              run_poetry_command("pyenv exec pip install -r " + \
+                                 NativeHelpers.python_requirements_path)
             end
 
             run_poetry_command("pyenv exec poetry lock")
@@ -271,11 +270,6 @@ module Dependabot
         def python_version_file
           dependency_files.find { |f| f.name == ".python-version" }
         end
-
-        def python_requirements_path
-          project_root = File.join(File.dirname(__FILE__), "../../../../..")
-          File.join(project_root, "helpers/python/requirements.txt")
-        end
       end
     end
   end

data/lib/dependabot/python/native_helpers.rb

@@ -4,14 +4,25 @@ module Dependabot
   module Python
     module NativeHelpers
       def self.python_helper_path
-        helpers_dir = File.join(native_helpers_root, "python/helpers")
-        Pathname.new(File.join(helpers_dir, "run.py")).cleanpath.to_path
+        clean_path(File.join(python_helpers_dir, "run.py"))
+      end
+
+      def self.python_requirements_path
+        clean_path(File.join(python_helpers_dir, "requirements.txt"))
+      end
+
+      def self.python_helpers_dir
+        File.join(native_helpers_root, "python/helpers")
       end
 
       def self.native_helpers_root
         default_path = File.join(__dir__, "../../../..")
         ENV.fetch("DEPENDABOT_NATIVE_HELPERS_PATH", default_path)
       end
+
+      def self.clean_path(path)
+        Pathname.new(path).cleanpath.to_path
+      end
     end
   end
 end

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

@@ -265,11 +265,6 @@ module Dependabot
           end
         end
 
-        def python_helper_path
-          project_root = File.join(File.dirname(__FILE__), "../../../../..")
-          File.join(project_root, "helpers/python/run.py")
-        end
-
         # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
           name.downcase.gsub(/[-_.]+/, "-")

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

@@ -3,14 +3,15 @@
 require "excon"
 require "toml-rb"
 
+require "dependabot/errors"
+require "dependabot/shared_helpers"
 require "dependabot/python/file_parser"
 require "dependabot/python/file_updater/pipfile_preparer"
 require "dependabot/python/file_updater/setup_file_sanitizer"
 require "dependabot/python/update_checker"
 require "dependabot/python/python_versions"
-require "dependabot/shared_helpers"
+require "dependabot/python/native_helpers"
 require "dependabot/python/version"
-require "dependabot/errors"
 
 # rubocop:disable Metrics/ClassLength
 module Dependabot
@@ -350,7 +351,8 @@ module Dependabot
           return if pre_installed_python?(python_version)
 
           SharedHelpers.run_shell_command(
-            "pyenv exec pip install -r #{python_requirements_path}"
+            "pyenv exec pip install -r " + \
+            NativeHelpers.python_requirements_path
           )
         end
 
@@ -522,11 +524,6 @@ module Dependabot
           environment_variables.join(" ") + " "
         end
 
-        def python_requirements_path
-          project_root = File.join(File.dirname(__FILE__), "../../../..")
-          File.join(project_root, "helpers/python/requirements.txt")
-        end
-
         # See https://www.python.org/dev/peps/pep-0503/#normalized-names
         def normalise(name)
           name.downcase.gsub(/[-_.]+/, "-")

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

@@ -3,13 +3,13 @@
 require "excon"
 require "toml-rb"
 
+require "dependabot/errors"
+require "dependabot/shared_helpers"
 require "dependabot/python/file_parser"
 require "dependabot/python/file_updater/pyproject_preparer"
 require "dependabot/python/update_checker"
-require "dependabot/shared_helpers"
 require "dependabot/python/version"
 require "dependabot/python/requirement"
-require "dependabot/errors"
 require "dependabot/python/native_helpers"
 require "dependabot/python/python_versions"
 
@@ -55,9 +55,8 @@ module Dependabot
 
               if python_version && !pre_installed_python?(python_version)
                 run_poetry_command("pyenv install -s")
-                run_poetry_command(
-                  "pyenv exec pip install -r #{python_requirements_path}"
-                )
+                run_poetry_command("pyenv exec pip install -r " + \
+                                   NativeHelpers.python_requirements_path)
               end
 
               # Shell out to Poetry, which handles everything for us.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.79.3
+  version: 0.79.4
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.79.3
+        version: 0.79.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.79.3
+        version: 0.79.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement