dependabot-conda 0.391.0 → 0.392.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77bb5fb35cc078e208e8c9d1670a7599fa3333d3a046e5dcf38aee7eba9084ff
-  data.tar.gz: 9d2a56aa0bfefbfc1a679cc55c121f447e8b234b637ff568477c284c385b15b9
+  metadata.gz: ee822579eaf5c3ed3b029528a4a9204ee40b7a5c26d17807f5261fca44c1323d
+  data.tar.gz: c2f2173d3829508e9a7a63f1ec80c840034c20356857af4507f112d743bc99d7
 SHA512:
-  metadata.gz: 55cbd0430fe8db6db9ad97b0860c201f5dd86495a7f74c2d07291dd3609ed0e1050040a6fb1e29902cfd7c6be6a95eb4e14ccf42d51b93f7172151b689fa2047
-  data.tar.gz: 15edf2e2443b27fdc650ef6354e5bbc8ad6b89d1d643400d6e76fb81ac49919d9ecfd10935d9ffd1b6fffa6e9698ebd8f305fcc2c012c518340f55e3b1065f38
+  metadata.gz: aac051bca37bee0e86824f3cab6dbb388d509bb2f86e4fc4c53e851ce36b754e64a40e007edf2a1641e5770fa1754072ff409ba7d4e23fdda050476d6006fb70
+  data.tar.gz: 5c63b5fcdedb799ae284aa15a1eb151138c84b1d7ea37c435811ac0f9f04b8b1a340827e299deb100a6a3d39f40bb1a372934f44babe699a7309d5452ec48ad9

data/lib/dependabot/conda/file_parser.rb

@@ -15,6 +15,14 @@ module Dependabot
     class FileParser < Dependabot::FileParsers::Base
       extend T::Sig
 
+      ParsedDependency = T.type_alias do
+        {
+          name: String,
+          version: T.nilable(String),
+          requirements: T::Array[Dependabot::DependencyRequirement]
+        }
+      end
+
       sig { override.returns(T::Array[Dependabot::Dependency]) }
       def parse
         dependencies = T.let([], T::Array[Dependabot::Dependency])
@@ -99,13 +107,13 @@ module Dependabot
           parsed_dep = parse_conda_dependency_string(dep, file)
           next unless parsed_dep
 
-          name = T.cast(parsed_dep[:name], String)
+          name = parsed_dep[:name]
           next if name == "pip"
 
           parsed_dependencies << create_dependency(
             name: name,
-            version: T.cast(parsed_dep[:version], T.nilable(String)),
-            requirements: T.cast(parsed_dep[:requirements], T::Array[T::Hash[Symbol, T.anything]]),
+            version: parsed_dep[:version],
+            requirements: parsed_dep[:requirements],
             package_manager: "conda"
           )
         end
@@ -137,9 +145,9 @@ module Dependabot
           next unless parsed_dep
 
           parsed_dependencies << create_dependency(
-            name: T.cast(parsed_dep[:name], String),
-            version: T.cast(parsed_dep[:version], T.nilable(String)),
-            requirements: T.cast(parsed_dep[:requirements], T::Array[T::Hash[Symbol, T.anything]]),
+            name: parsed_dep[:name],
+            version: parsed_dep[:version],
+            requirements: parsed_dep[:requirements],
             package_manager: "pip"
           )
         end
@@ -147,9 +155,7 @@ module Dependabot
         parsed_dependencies
       end
 
-      sig do
-        params(dep_string: String, file: Dependabot::DependencyFile).returns(T.nilable(T::Hash[Symbol, T.anything]))
-      end
+      sig { params(dep_string: String, file: Dependabot::DependencyFile).returns(T.nilable(ParsedDependency)) }
       def parse_conda_dependency_string(dep_string, file)
         return nil if dep_string.nil?
 
@@ -168,7 +174,7 @@ module Dependabot
         match = normalized_dep_string.match(/^([a-zA-Z0-9_.-]+)(?:\s*(.+))?$/)
         return nil unless match
 
-        name = match[1]
+        name = T.must(match[1])
         constraint = match[2]&.strip
 
         version = extract_conda_version(constraint)
@@ -221,27 +227,25 @@ module Dependabot
           constraint: T.nilable(String),
           file: Dependabot::DependencyFile,
           channel: T.nilable(String)
-        ).returns(T::Array[T::Hash[Symbol, T.anything]])
+        ).returns(T::Array[Dependabot::DependencyRequirement])
       end
       def build_conda_requirements(constraint, file, channel = nil)
         source = channel ? { channel: channel } : nil
 
-        [{
+        [Dependabot::DependencyRequirement.create(
           requirement: constraint && !constraint.empty? ? constraint : nil,
           file: file.name,
           source: source,
           groups: ["dependencies"]
-        }]
+        )]
       end
 
-      sig do
-        params(dep_string: String, file: Dependabot::DependencyFile).returns(T.nilable(T::Hash[Symbol, T.anything]))
-      end
+      sig { params(dep_string: String, file: Dependabot::DependencyFile).returns(T.nilable(ParsedDependency)) }
       def parse_pip_dependency_string(dep_string, file)
         match = dep_string.match(/^([a-zA-Z0-9_.-]+)(?:\s*(==|>=|>|<=|<|!=|~=)\s*([0-9][a-zA-Z0-9._+-]*))?$/)
         return nil unless match
 
-        name = match[1]
+        name = T.must(match[1])
         operator = match[2]
         version = match[3]
 
@@ -259,16 +263,15 @@ module Dependabot
           end
         end
 
-        requirements = if operator && version
-                         [{
-                           requirement: "#{operator}#{version}",
-                           file: file.name,
-                           source: nil,
-                           groups: ["pip"]
-                         }]
-                       else
-                         []
-                       end
+        requirements = T.let([], T::Array[Dependabot::DependencyRequirement])
+        if operator && version
+          requirements << Dependabot::DependencyRequirement.create(
+            requirement: "#{operator}#{version}",
+            file: file.name,
+            source: nil,
+            groups: ["pip"]
+          )
+        end
 
         {
           name: name,
@@ -281,7 +284,7 @@ module Dependabot
         params(
           name: String,
           version: T.nilable(String),
-          requirements: T::Array[T::Hash[Symbol, T.anything]],
+          requirements: T::Array[Dependabot::DependencyRequirement],
           package_manager: String
         ).returns(Dependabot::Dependency)
       end

data/lib/dependabot/conda/file_updater.rb

@@ -231,9 +231,7 @@ module Dependabot
       def get_requirement_for_dependency(dependency, context)
         # Look for a requirement in the dependency's requirements array
         requirements = dependency.requirements
-        requirement = nil
-
-        requirement = requirements.first&.dig(:requirement) unless requirements.empty?
+        requirement = requirements.first&.requirement_string unless requirements.empty?
 
         return requirement if requirement && !requirement.empty?
 

data/lib/dependabot/conda/metadata_finder.rb

@@ -29,7 +29,7 @@ module Dependabot
 
       sig { returns(T::Boolean) }
       def pip_dependency?
-        dependency.requirements.any? { |req| req[:groups]&.include?("pip") }
+        dependency.requirements.any? { |req| req.groups&.include?("pip") }
       end
 
       sig { returns(Dependabot::Python::MetadataFinder) }

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

@@ -61,7 +61,7 @@ module Dependabot
 
         sig { returns(T::Boolean) }
         def pip_dependency?
-          dependency.requirements.any? { |req| req[:groups]&.include?("pip") }
+          dependency.requirements.any? { |req| req.groups&.include?("pip") }
         end
 
         sig { returns(T.nilable(Dependabot::Package::PackageDetails)) }
@@ -115,13 +115,11 @@ module Dependabot
 
         sig { returns(T.nilable(String)) }
         def extract_channel_from_source
-          return nil unless dependency.requirements.first
+          requirement = dependency.requirements.first
+          return nil unless requirement
 
-          source = T.let(T.must(dependency.requirements.first)[:source], T.nilable(T::Hash[Symbol, Object]))
-          return nil unless source
-
-          channel = source[:channel]
-          return nil unless channel.is_a?(String)
+          channel = requirement.source_string("channel")
+          return nil unless channel
           return nil unless CondaRegistryClient::SUPPORTED_CHANNELS.include?(channel)
 
           channel
@@ -130,7 +128,7 @@ module Dependabot
         sig { returns(T.nilable(String)) }
         def extract_channel_from_requirement
           dependency.requirements.each do |req|
-            requirement_string = req[:requirement]
+            requirement_string = req.requirement_string
             next unless requirement_string&.include?("::")
 
             channel = requirement_string.split("::").first
@@ -185,11 +183,11 @@ module Dependabot
           )
         end
 
-        sig { returns(T::Array[T::Hash[Symbol, T.anything]]) }
+        sig { returns(T::Array[Dependabot::DependencyRequirement]) }
         def python_compatible_requirements
           dependency.requirements.map do |req|
-            req.merge(
-              requirement: convert_conda_requirement_to_pip(req[:requirement])
+            Dependabot::DependencyRequirement.create(
+              req.merge(requirement: convert_conda_requirement_to_pip(req.requirement_string))
             )
           end
         end

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

@@ -72,10 +72,11 @@ module Dependabot
 
         sig { params(req: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
         def update_requirement(req)
-          return req unless req[:requirement]
-          return req if ["", "*"].include?(req[:requirement])
+          requirement = req.requirement_string
+          return req unless requirement
+          return req if ["", "*"].include?(requirement)
 
-          requirement_strings = req[:requirement].split(",").map(&:strip)
+          requirement_strings = requirement.split(",").map(&:strip)
           new_req = calculate_updated_requirement(req, requirement_strings)
 
           Dependabot::DependencyRequirement.create(
@@ -121,7 +122,7 @@ module Dependabot
           # For BumpVersions strategy, always update to the new version
           if update_strategy == RequirementsUpdateStrategy::BumpVersionsIfNecessary &&
              new_version_satisfies?(req)
-            return req[:requirement]
+            return T.must(req.requirement)
           end
 
           update_requirements_range(requirement_strings)
@@ -133,10 +134,10 @@ module Dependabot
           # For BumpVersions strategy, always update to the new version
           if update_strategy == RequirementsUpdateStrategy::BumpVersionsIfNecessary &&
              new_version_satisfies?(req)
-            return req[:requirement]
+            return T.must(req.requirement)
           end
 
-          bump_version_string(req[:requirement], T.must(latest_resolvable_version).to_s)
+          bump_version_string(T.must(req.requirement_string), T.must(latest_resolvable_version).to_s)
         end
 
         sig do
@@ -174,21 +175,23 @@ module Dependabot
 
         sig { params(req: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
         def widen_requirement(req)
-          return req unless req[:requirement]
-          return req if ["", "*"].include?(req[:requirement])
+          requirement = req.requirement_string
+          return req unless requirement
+          return req if ["", "*"].include?(requirement)
 
           # 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])
+          new_requirement = widen_requirement_string(requirement)
           Dependabot::DependencyRequirement.create(req.merge(requirement: new_requirement))
         end
 
         sig { params(req: Dependabot::DependencyRequirement).returns(T::Boolean) }
         def new_version_satisfies?(req)
-          return false unless req[:requirement]
+          requirement = req.requirement_string
+          return false unless requirement
 
           Conda::Requirement
-            .requirements_array(req[:requirement])
+            .requirements_array(requirement)
             .all? { |r| r.satisfied_by?(T.must(latest_resolvable_version)) }
         end
 

data/lib/dependabot/conda/update_checker.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: strong
 # frozen_string_literal: true
 
 require "sorbet-runtime"
@@ -50,7 +50,7 @@ module Dependabot
 
       sig { override.returns(T.nilable(T.any(String, Dependabot::Version))) }
       def latest_version
-        return nil if dependency.requirements.all? { |req| req[:requirement].nil? || req[:requirement] == "*" }
+        return nil if dependency.requirements.all? { |req| req.requirement.nil? || req.requirement == "*" }
 
         @latest_version ||= fetch_latest_version
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-conda
 version: !ruby/object:Gem::Version
-  version: 0.391.0
+  version: 0.392.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.391.0
+        version: 0.392.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.391.0
+        version: 0.392.0
 - !ruby/object:Gem::Dependency
   name: dependabot-python
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.391.0
+        version: 0.392.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.391.0
+        version: 0.392.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.391.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.392.0
 rdoc_options: []
 require_paths:
 - lib