Skip to content

Commit

Permalink
Removed typecheck form setup_file_sanitixer
Browse files Browse the repository at this point in the history
  • Loading branch information
randhircs committed Jan 16, 2025
1 parent a4512a5 commit 31a98a3
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions python/lib/dependabot/python/file_updater/setup_file_sanitizer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# typed: strict
# typed: true
# frozen_string_literal: true

require "dependabot/python/file_updater"
Expand All @@ -13,13 +13,11 @@ class FileUpdater
class SetupFileSanitizer
extend T::Sig

sig { params(setup_file: DependencyFile, setup_cfg: T.untyped).void }
def initialize(setup_file:, setup_cfg:)
@setup_file = setup_file
@setup_cfg = setup_cfg
end

sig { returns(String) }
def sanitized_content
# The part of the setup.py that Pipenv cares about appears to be the
# install_requires. A name and version are required by don't end up
Expand All @@ -36,17 +34,13 @@ def sanitized_content

private

sig { returns(DependencyFile) }
attr_reader :setup_file
sig { returns(String) }
attr_reader :setup_cfg

sig { returns(T::Boolean) }
def include_pbr?
setup_requires_array.any? { |d| d.start_with?("pbr") }
end

sig { returns(T.untyped) }
def install_requires_array
@install_requires_array = T.let(T.untyped, T.untyped)
@install_requires_array ||=
Expand All @@ -58,9 +52,7 @@ def install_requires_array
end
end

sig { returns(T::Array[String]) }
def setup_requires_array
@setup_requires_array = T.let(T.untyped, T.untyped)
@setup_requires_array ||=
parsed_setup_file.dependencies.filter_map do |dep|
next unless dep.requirements.first[:groups]
Expand All @@ -70,9 +62,7 @@ def setup_requires_array
end
end

sig { returns(T.untyped) }
def extras_require_hash
@extras_require_hash = T.let(T.untyped, T.untyped)
@extras_require_hash ||=
begin
hash = {}
Expand All @@ -90,18 +80,15 @@ def extras_require_hash
end
end

sig { returns(T.untyped) }
def parsed_setup_file
@parsed_setup_file ||= T.let(Python::FileParser::SetupFileParser.new(
@parsed_setup_file ||= Python::FileParser::SetupFileParser.new(
dependency_files: [
setup_file.dup.tap { |f| f.name = "setup.py" },
setup_cfg.dup.tap { |f| f.name = "setup.cfg" }
].compact
)
.dependency_set, T.untyped)
).dependency_set
end

sig { returns(T.nilable(String)) }
def package_name
content = setup_file.content
match = T.must(content).match(/name\s*=\s*['"](?<package_name>[^'"]+)['"]/)
Expand Down

0 comments on commit 31a98a3

Please sign in to comment.