dependabot-python 0.95.50 → 0.95.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2e710a46e701b0d88c05d30cbb7ae34d375dad71b4ded6e33bbd21bbd9dbc44
-  data.tar.gz: 62906919a14de657cbb323a0a4e39665596d65fa90ad3208c630dadf6fca442e
+  metadata.gz: 8fcb52dff0bc8603272b93a4239de32120123964c5e971b0dd339465fde68736
+  data.tar.gz: 0b7021ee525343c190dadf2fd8067dafad34cc58a442168134e3c7c2423523c6
 SHA512:
-  metadata.gz: f3ff07889ebb4864e03a753ef6b57049786e05a57ea8758b48767a709ddfeacf6b8f806893d87ad56ae232884bfefaf5e8b6d75fec5d4def9ae5ba90e9e1f492
-  data.tar.gz: 3122677849c56be6c252fd1b8d95f4220226f311563b89de3c1b393b7d455feb71d3ea49f8f161424492df8d6540f2ffbe10402a745678fa53ce585b14b2e76f
+  metadata.gz: d909016f83d24e8548433cb7925bbd6050cfa1251b8e1621fe1f28546c7d9e62a7f363b0fde927b774b96090452ff8b3c8bbce3d4f1d02e658de856ea274b775
+  data.tar.gz: f8a825c554c068a2ebcc4cb304473fbd0f60fb6b32a9a917245f51189187fa6d00810b64bcf518689094fd30ba0d4d3442223211df065693ae649e4b3bf2cf58

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

@@ -151,8 +151,8 @@ module Dependabot
 
         def freeze_other_dependencies(pipfile_content)
           PipfilePreparer.
-            new(pipfile_content: pipfile_content).
-            freeze_top_level_dependencies_except(dependencies, lockfile)
+            new(pipfile_content: pipfile_content, lockfile: lockfile).
+            freeze_top_level_dependencies_except(dependencies)
         end
 
         def freeze_dependencies_being_updated(pipfile_content)

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

@@ -9,8 +9,9 @@ module Dependabot
   module Python
     class FileUpdater
       class PipfilePreparer
-        def initialize(pipfile_content:)
+        def initialize(pipfile_content:, lockfile: nil)
           @pipfile_content = pipfile_content
+          @lockfile = lockfile
         end
 
         def replace_sources(credentials)
@@ -23,7 +24,7 @@ module Dependabot
           TomlRB.dump(pipfile_object)
         end
 
-        def freeze_top_level_dependencies_except(dependencies, lockfile)
+        def freeze_top_level_dependencies_except(dependencies)
           return pipfile_content unless lockfile
 
           pipfile_object = TomlRB.parse(pipfile_content)
@@ -35,7 +36,7 @@ module Dependabot
             pipfile_object.fetch(keys[:pipfile]).each do |dep_name, _|
               next if excluded_names.include?(normalise(dep_name))
 
-              freeze_dependency(dep_name, pipfile_object, lockfile, keys)
+              freeze_dependency(dep_name, pipfile_object, keys)
             end
           end
 
@@ -43,14 +44,12 @@ module Dependabot
         end
 
         # rubocop:disable Metrics/PerceivedComplexity
-        def freeze_dependency(dep_name, pipfile_object, lockfile, keys)
+        def freeze_dependency(dep_name, pipfile_object, keys)
           locked_version = version_from_lockfile(
-            lockfile,
             keys[:lockfile],
             normalise(dep_name)
           )
           locked_ref = ref_from_lockfile(
-            lockfile,
             keys[:lockfile],
             normalise(dep_name)
           )
@@ -79,11 +78,10 @@ module Dependabot
 
         private
 
-        attr_reader :pipfile_content
+        attr_reader :pipfile_content, :lockfile
 
-        def version_from_lockfile(lockfile, dep_type, dep_name)
-          details = JSON.parse(lockfile.content).
-                    dig(dep_type, normalise(dep_name))
+        def version_from_lockfile(dep_type, dep_name)
+          details = parsed_lockfile.dig(dep_type, normalise(dep_name))
 
           case details
           when String then details.gsub(/^==/, "")
@@ -91,15 +89,18 @@ module Dependabot
           end
         end
 
-        def ref_from_lockfile(lockfile, dep_type, dep_name)
-          details = JSON.parse(lockfile.content).
-                    dig(dep_type, normalise(dep_name))
+        def ref_from_lockfile(dep_type, dep_name)
+          details = parsed_lockfile.dig(dep_type, normalise(dep_name))
 
           case details
           when Hash then details["ref"]
           end
         end
 
+        def parsed_lockfile
+          @parsed_lockfile ||= JSON.parse(lockfile.content)
+        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

@@ -291,8 +291,8 @@ module Dependabot
 
         def freeze_other_dependencies(pipfile_content)
           Python::FileUpdater::PipfilePreparer.
-            new(pipfile_content: pipfile_content).
-            freeze_top_level_dependencies_except([dependency], lockfile)
+            new(pipfile_content: pipfile_content, lockfile: lockfile).
+            freeze_top_level_dependencies_except([dependency])
         end
 
         def unlock_target_dependency(pipfile_content)

metadata

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