dependabot-conda 0.382.0 → 0.383.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51498462a485932edbd154b6014b6a202b3a0ba82e6ed64660fc047024b8ab1
-  data.tar.gz: c8528084a32a20de6b9e2233873f25dea6c45ddb8eeaac790af2c5d1dd1c25a8
+  metadata.gz: 5f9acad503f7df0d2aa6dca7c9178b12eb40f3154ecdfdbc8c5eefd8ee477f7d
+  data.tar.gz: ef4aad9f20ee500a81382df84c103cbea2b16f9beead32ba6cd032da992e11d5
 SHA512:
-  metadata.gz: c5d632218a024b6523ca3e4457fffb36d4bbb862eb4523d1346f715b9188385fd381c9053311dcfcec9b33c641d6ad9905201e88d3f2420642e6f839cd1da13f
-  data.tar.gz: 7c1b20b9e157ef896ef3956a855022c8caf6289a9da9dc77eb83f3f9fa4981d62f6beb0ff9210374881f1c6097815583e07299141a2c8ee8a1ca25c7ead5911b
+  metadata.gz: 1b707854c1d7d69a4a85e9e12ca15d4ebdac78e422428aaee40e70b1d07f29ff20985cbbf5fa00e83a479c5cc64dc0530bb26a9f3d87993e2c045efca53e6d77
+  data.tar.gz: 0c462bd7b6672c947902f031bed4001eaeea2d78fa199879cd72f4febfd28c7f40fb26ad5813377ad4fd3ec32038e2101ea6984fb8762cdd025c413105c1da20

data/lib/dependabot/conda/update_checker/requirements_updater.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "sorbet-runtime"
+require "dependabot/dependency_requirement"
 require "dependabot/conda/requirement"
 require "dependabot/conda/update_checker"
 require "dependabot/conda/version"
@@ -13,7 +14,7 @@ module Dependabot
       class RequirementsUpdater
         extend T::Sig
 
-        sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+        sig { returns(T::Array[Dependabot::DependencyRequirement]) }
         attr_reader :requirements
 
         sig { returns(Dependabot::RequirementsUpdateStrategy) }
@@ -24,13 +25,16 @@ module Dependabot
 
         sig do
           params(
-            requirements: T::Array[T::Hash[Symbol, T.untyped]],
+            requirements: T::Array[Dependabot::DependencyRequirement],
             update_strategy: Dependabot::RequirementsUpdateStrategy,
             latest_resolvable_version: T.nilable(String)
           ).void
         end
         def initialize(requirements:, update_strategy:, latest_resolvable_version:)
-          @requirements = requirements
+          @requirements = T.let(
+            requirements.map { |req| Dependabot::DependencyRequirement.create(req) },
+            T::Array[Dependabot::DependencyRequirement]
+          )
           @update_strategy = update_strategy
           @latest_resolvable_version = T.let(
             (Conda::Version.new(latest_resolvable_version) if latest_resolvable_version),
@@ -38,7 +42,7 @@ module Dependabot
           )
         end
 
-        sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+        sig { returns(T::Array[Dependabot::DependencyRequirement]) }
         def updated_requirements
           return requirements if update_strategy.lockfile_only?
           return requirements unless latest_resolvable_version
@@ -59,14 +63,14 @@ module Dependabot
 
         private
 
-        sig { params(req: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+        sig { params(req: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
         def update_requirement_if_needed(req)
           return req if new_version_satisfies?(req)
 
           update_requirement(req)
         end
 
-        sig { params(req: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+        sig { params(req: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
         def update_requirement(req)
           return req unless req[:requirement]
           return req if ["", "*"].include?(req[:requirement])
@@ -74,10 +78,17 @@ module Dependabot
           requirement_strings = req[:requirement].split(",").map(&:strip)
           new_req = calculate_updated_requirement(req, requirement_strings)
 
-          new_req == :unfixable ? req.merge(requirement: :unfixable) : req.merge(requirement: new_req)
+          Dependabot::DependencyRequirement.create(
+            new_req == :unfixable ? req.merge(requirement: :unfixable) : req.merge(requirement: new_req)
+          )
         end
 
-        sig { params(req: T::Hash[Symbol, T.untyped], requirement_strings: T::Array[String]).returns(T.any(String, Symbol)) }
+        sig do
+          params(
+            req: Dependabot::DependencyRequirement,
+            requirement_strings: T::Array[String]
+          ).returns(T.any(String, Symbol))
+        end
         def calculate_updated_requirement(req, requirement_strings)
           # Step 1: Check for equality match first (e.g., "==1.21.0" or bare "1.21.0")
           return handle_equality_match(requirement_strings) if equality_match?(requirement_strings)
@@ -99,7 +110,12 @@ module Dependabot
           find_and_update_equality_match(requirement_strings, latest_resolvable_version)
         end
 
-        sig { params(req: T::Hash[Symbol, T.untyped], requirement_strings: T::Array[String]).returns(T.any(String, Symbol)) }
+        sig do
+          params(
+            req: Dependabot::DependencyRequirement,
+            requirement_strings: T::Array[String]
+          ).returns(T.any(String, Symbol))
+        end
         def handle_range_requirement(req, requirement_strings)
           # Only skip update if using BumpVersionsIfNecessary strategy and version already satisfies
           # For BumpVersions strategy, always update to the new version
@@ -111,7 +127,7 @@ module Dependabot
           update_requirements_range(requirement_strings)
         end
 
-        sig { params(req: T::Hash[Symbol, T.untyped]).returns(T.any(String, Symbol)) }
+        sig { params(req: Dependabot::DependencyRequirement).returns(T.any(String, Symbol)) }
         def handle_single_constraint(req)
           # Only skip update if using BumpVersionsIfNecessary strategy and version already satisfies
           # For BumpVersions strategy, always update to the new version
@@ -156,7 +172,7 @@ module Dependabot
           "#{operator}#{latest_version}"
         end
 
-        sig { params(req: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+        sig { params(req: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
         def widen_requirement(req)
           return req unless req[:requirement]
           return req if ["", "*"].include?(req[:requirement])
@@ -164,10 +180,10 @@ module Dependabot
           # For WidenRanges, always widen to ensure proper upper bounds
           # Don't return early even if version satisfies - we want to add/update bounds
           new_requirement = widen_requirement_string(req[:requirement])
-          req.merge(requirement: new_requirement)
+          Dependabot::DependencyRequirement.create(req.merge(requirement: new_requirement))
         end
 
-        sig { params(req: T::Hash[Symbol, T.untyped]).returns(T::Boolean) }
+        sig { params(req: Dependabot::DependencyRequirement).returns(T::Boolean) }
         def new_version_satisfies?(req)
           return false unless req[:requirement]
 

data/lib/dependabot/conda/update_checker.rb

@@ -96,13 +96,11 @@ module Dependabot
 
       sig { override.returns(T::Array[Dependabot::DependencyRequirement]) }
       def updated_requirements
-        wrap_requirements(
-          RequirementsUpdater.new(
-            requirements: dependency.requirements,
-            update_strategy: requirements_update_strategy,
-            latest_resolvable_version: preferred_resolvable_version&.to_s
-          ).updated_requirements
-        )
+        RequirementsUpdater.new(
+          requirements: dependency.requirements,
+          update_strategy: requirements_update_strategy,
+          latest_resolvable_version: preferred_resolvable_version&.to_s
+        ).updated_requirements
       end
 
       sig { override.returns(Dependabot::RequirementsUpdateStrategy) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-conda
 version: !ruby/object:Gem::Version
-  version: 0.382.0
+  version: 0.383.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.382.0
+        version: 0.383.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.382.0
+        version: 0.383.0
 - !ruby/object:Gem::Dependency
   name: dependabot-python
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.382.0
+        version: 0.383.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.382.0
+        version: 0.383.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +274,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.382.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.383.0
 rdoc_options: []
 require_paths:
 - lib