dependabot-python 0.403.0 → 0.405.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/helpers/lib/parser.py +14 -9
- data/helpers/run.py +1 -1
- data/helpers/test/test_parse_requirements.py +17 -0
- data/lib/dependabot/python/dependency_grapher/requirements_layers.rb +2 -24
- data/lib/dependabot/python/dependency_grapher.rb +7 -3
- data/lib/dependabot/python/file_parser/pep_dependency.rb +4 -1
- data/lib/dependabot/python/file_parser/poetry_lock/record.rb +124 -0
- data/lib/dependabot/python/file_parser/poetry_lock.rb +73 -39
- data/lib/dependabot/python/file_parser/pyproject_document/pep621_mutations.rb +154 -0
- data/lib/dependabot/python/file_parser/pyproject_document/poetry_mutations.rb +195 -0
- data/lib/dependabot/python/file_parser/pyproject_document.rb +42 -0
- data/lib/dependabot/python/file_parser/pyproject_files_parser.rb +16 -3
- data/lib/dependabot/python/file_parser.rb +63 -54
- data/lib/dependabot/python/file_updater/poetry_file_updater/pep621_updater.rb +30 -10
- data/lib/dependabot/python/file_updater/poetry_file_updater.rb +56 -76
- data/lib/dependabot/python/file_updater/pyproject_preparer.rb +32 -197
- data/lib/dependabot/python/file_updater.rb +9 -5
- data/lib/dependabot/python/language.rb +5 -5
- data/lib/dependabot/python/marker_evaluator.rb +248 -0
- data/lib/dependabot/python/poetry_subdependency_pin.rb +112 -0
- data/lib/dependabot/python/requirement_references.rb +34 -0
- data/lib/dependabot/python/shared_file_fetcher.rb +3 -2
- data/lib/dependabot/python/update_checker/pip_version_resolver.rb +4 -5
- data/lib/dependabot/python/update_checker/poetry_version_resolver.rb +48 -51
- data/lib/dependabot/python/update_checker.rb +14 -1
- metadata +10 -5
- data/lib/dependabot/python/update_checker/pip_version_resolver/marker_evaluator.rb +0 -241
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dependabot-python
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.405.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dependabot
|
|
@@ -15,14 +15,14 @@ dependencies:
|
|
|
15
15
|
requirements:
|
|
16
16
|
- - '='
|
|
17
17
|
- !ruby/object:Gem::Version
|
|
18
|
-
version: 0.
|
|
18
|
+
version: 0.405.0
|
|
19
19
|
type: :runtime
|
|
20
20
|
prerelease: false
|
|
21
21
|
version_requirements: !ruby/object:Gem::Requirement
|
|
22
22
|
requirements:
|
|
23
23
|
- - '='
|
|
24
24
|
- !ruby/object:Gem::Version
|
|
25
|
-
version: 0.
|
|
25
|
+
version: 0.405.0
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: debug
|
|
28
28
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -285,7 +285,10 @@ files:
|
|
|
285
285
|
- lib/dependabot/python/file_parser/pipfile_files_parser.rb
|
|
286
286
|
- lib/dependabot/python/file_parser/pipfile_lock_document.rb
|
|
287
287
|
- lib/dependabot/python/file_parser/poetry_lock.rb
|
|
288
|
+
- lib/dependabot/python/file_parser/poetry_lock/record.rb
|
|
288
289
|
- lib/dependabot/python/file_parser/pyproject_document.rb
|
|
290
|
+
- lib/dependabot/python/file_parser/pyproject_document/pep621_mutations.rb
|
|
291
|
+
- lib/dependabot/python/file_parser/pyproject_document/poetry_mutations.rb
|
|
289
292
|
- lib/dependabot/python/file_parser/pyproject_files_parser.rb
|
|
290
293
|
- lib/dependabot/python/file_parser/python_requirement_parser.rb
|
|
291
294
|
- lib/dependabot/python/file_parser/setup_file_parser.rb
|
|
@@ -302,6 +305,7 @@ files:
|
|
|
302
305
|
- lib/dependabot/python/file_updater/setup_file_sanitizer.rb
|
|
303
306
|
- lib/dependabot/python/language.rb
|
|
304
307
|
- lib/dependabot/python/language_version_manager.rb
|
|
308
|
+
- lib/dependabot/python/marker_evaluator.rb
|
|
305
309
|
- lib/dependabot/python/metadata_finder.rb
|
|
306
310
|
- lib/dependabot/python/name_normaliser.rb
|
|
307
311
|
- lib/dependabot/python/native_helpers.rb
|
|
@@ -314,14 +318,15 @@ files:
|
|
|
314
318
|
- lib/dependabot/python/pip_compile_file_matcher.rb
|
|
315
319
|
- lib/dependabot/python/pipenv_runner.rb
|
|
316
320
|
- lib/dependabot/python/poetry_plugin_installer.rb
|
|
321
|
+
- lib/dependabot/python/poetry_subdependency_pin.rb
|
|
317
322
|
- lib/dependabot/python/requirement.rb
|
|
318
323
|
- lib/dependabot/python/requirement_parser.rb
|
|
324
|
+
- lib/dependabot/python/requirement_references.rb
|
|
319
325
|
- lib/dependabot/python/shared_file_fetcher.rb
|
|
320
326
|
- lib/dependabot/python/update_checker.rb
|
|
321
327
|
- lib/dependabot/python/update_checker/latest_version_finder.rb
|
|
322
328
|
- lib/dependabot/python/update_checker/pip_compile_version_resolver.rb
|
|
323
329
|
- lib/dependabot/python/update_checker/pip_version_resolver.rb
|
|
324
|
-
- lib/dependabot/python/update_checker/pip_version_resolver/marker_evaluator.rb
|
|
325
330
|
- lib/dependabot/python/update_checker/pipenv_version_resolver.rb
|
|
326
331
|
- lib/dependabot/python/update_checker/poetry_version_resolver.rb
|
|
327
332
|
- lib/dependabot/python/update_checker/requirements_updater.rb
|
|
@@ -331,7 +336,7 @@ licenses:
|
|
|
331
336
|
- MIT
|
|
332
337
|
metadata:
|
|
333
338
|
bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
|
|
334
|
-
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.
|
|
339
|
+
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.405.0
|
|
335
340
|
rdoc_options: []
|
|
336
341
|
require_paths:
|
|
337
342
|
- lib
|
|
@@ -1,241 +0,0 @@
|
|
|
1
|
-
# typed: strong
|
|
2
|
-
# frozen_string_literal: true
|
|
3
|
-
|
|
4
|
-
require "dependabot/python/update_checker/pip_version_resolver"
|
|
5
|
-
|
|
6
|
-
module Dependabot
|
|
7
|
-
module Python
|
|
8
|
-
class UpdateChecker
|
|
9
|
-
class PipVersionResolver
|
|
10
|
-
class MarkerEvaluator
|
|
11
|
-
extend T::Sig
|
|
12
|
-
|
|
13
|
-
sig { params(requirement_string: String).returns([T.nilable(String), T.nilable(String)]) }
|
|
14
|
-
def split_requirement_and_marker(requirement_string)
|
|
15
|
-
separator_index = T.let(nil, T.nilable(Integer))
|
|
16
|
-
in_single_quote = T.let(false, T::Boolean)
|
|
17
|
-
in_double_quote = T.let(false, T::Boolean)
|
|
18
|
-
|
|
19
|
-
requirement_string.each_char.with_index do |char, index|
|
|
20
|
-
in_single_quote, in_double_quote, quote_toggled =
|
|
21
|
-
toggle_quote_state(char, in_single_quote, in_double_quote)
|
|
22
|
-
next if quote_toggled
|
|
23
|
-
next if in_single_quote || in_double_quote
|
|
24
|
-
next unless char == ";"
|
|
25
|
-
|
|
26
|
-
separator_index = index
|
|
27
|
-
break
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
return [requirement_string.strip, nil] if separator_index.nil?
|
|
31
|
-
|
|
32
|
-
requirement_part = requirement_string[0...separator_index]
|
|
33
|
-
marker_part = requirement_string[(separator_index + 1)..]
|
|
34
|
-
|
|
35
|
-
[requirement_part&.strip, marker_part&.strip]
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
sig { params(marker: String, python_version: String).returns(T::Boolean) }
|
|
39
|
-
def marker_satisfied?(marker:, python_version:)
|
|
40
|
-
evaluate_marker_expression(marker, python_version)
|
|
41
|
-
rescue ArgumentError
|
|
42
|
-
# If we cannot safely parse a python marker, treat it as applicable.
|
|
43
|
-
# This avoids silently skipping transitive constraints that may break installs.
|
|
44
|
-
true
|
|
45
|
-
end
|
|
46
|
-
|
|
47
|
-
private
|
|
48
|
-
|
|
49
|
-
sig { params(expression: String, python_version: String).returns(T::Boolean) }
|
|
50
|
-
def evaluate_marker_expression(expression, python_version)
|
|
51
|
-
expr = strip_wrapping_parentheses(expression.strip)
|
|
52
|
-
|
|
53
|
-
or_parts = split_top_level(expr, "or")
|
|
54
|
-
return or_parts.any? { |part| evaluate_marker_expression(part, python_version) } if or_parts.length > 1
|
|
55
|
-
|
|
56
|
-
and_parts = split_top_level(expr, "and")
|
|
57
|
-
if and_parts.length > 1
|
|
58
|
-
return and_parts.all? do |part|
|
|
59
|
-
evaluate_marker_expression(part, python_version) || !python_marker?(part)
|
|
60
|
-
end
|
|
61
|
-
end
|
|
62
|
-
|
|
63
|
-
not_expression = strip_top_level_not(expr)
|
|
64
|
-
if not_expression
|
|
65
|
-
return false unless python_marker?(not_expression)
|
|
66
|
-
|
|
67
|
-
return !evaluate_marker_expression(not_expression, python_version)
|
|
68
|
-
end
|
|
69
|
-
|
|
70
|
-
evaluate_python_version_condition(expr, python_version, default: python_marker?(expr))
|
|
71
|
-
end
|
|
72
|
-
|
|
73
|
-
sig { params(expression: String).returns(T.nilable(String)) }
|
|
74
|
-
def strip_top_level_not(expression)
|
|
75
|
-
return nil unless expression.start_with?("not")
|
|
76
|
-
return nil unless word_at?(expression, 0, "not")
|
|
77
|
-
|
|
78
|
-
remaining = expression[3..]&.strip
|
|
79
|
-
return nil if remaining.nil? || remaining.empty?
|
|
80
|
-
|
|
81
|
-
remaining
|
|
82
|
-
end
|
|
83
|
-
|
|
84
|
-
sig { params(expression: String).returns(T::Boolean) }
|
|
85
|
-
def python_marker?(expression)
|
|
86
|
-
expression.match?(/\bpython(?:_full)?_version\b/)
|
|
87
|
-
end
|
|
88
|
-
|
|
89
|
-
sig { params(expression: String).returns(String) }
|
|
90
|
-
def strip_wrapping_parentheses(expression)
|
|
91
|
-
expr = expression
|
|
92
|
-
while expr.start_with?("(") && expr.end_with?(")")
|
|
93
|
-
inner = expr[1...-1].to_s.strip
|
|
94
|
-
break unless balanced_parentheses?(inner)
|
|
95
|
-
|
|
96
|
-
expr = inner
|
|
97
|
-
end
|
|
98
|
-
|
|
99
|
-
expr
|
|
100
|
-
end
|
|
101
|
-
|
|
102
|
-
sig { params(expression: String).returns(T::Boolean) }
|
|
103
|
-
def balanced_parentheses?(expression)
|
|
104
|
-
depth = T.let(0, Integer)
|
|
105
|
-
in_single_quote = T.let(false, T::Boolean)
|
|
106
|
-
in_double_quote = T.let(false, T::Boolean)
|
|
107
|
-
|
|
108
|
-
expression.each_char do |char|
|
|
109
|
-
in_single_quote, in_double_quote, quote_toggled =
|
|
110
|
-
toggle_quote_state(char, in_single_quote, in_double_quote)
|
|
111
|
-
next if quote_toggled
|
|
112
|
-
next if in_single_quote || in_double_quote
|
|
113
|
-
|
|
114
|
-
depth += 1 if char == "("
|
|
115
|
-
depth -= 1 if char == ")"
|
|
116
|
-
return false if depth.negative?
|
|
117
|
-
end
|
|
118
|
-
|
|
119
|
-
depth.zero? && !in_single_quote && !in_double_quote
|
|
120
|
-
end
|
|
121
|
-
|
|
122
|
-
sig do
|
|
123
|
-
params(
|
|
124
|
-
char: String,
|
|
125
|
-
in_single_quote: T::Boolean,
|
|
126
|
-
in_double_quote: T::Boolean
|
|
127
|
-
).returns([T::Boolean, T::Boolean, T::Boolean])
|
|
128
|
-
end
|
|
129
|
-
def toggle_quote_state(char, in_single_quote, in_double_quote)
|
|
130
|
-
return [!in_single_quote, in_double_quote, true] if char == "'" && !in_double_quote
|
|
131
|
-
|
|
132
|
-
return [in_single_quote, !in_double_quote, true] if char == '"' && !in_single_quote
|
|
133
|
-
|
|
134
|
-
[in_single_quote, in_double_quote, false]
|
|
135
|
-
end
|
|
136
|
-
|
|
137
|
-
sig { params(expression: String, operator: String).returns(T::Array[String]) }
|
|
138
|
-
def split_top_level(expression, operator)
|
|
139
|
-
parts = T.let([], T::Array[String])
|
|
140
|
-
token = T.let(+"", String)
|
|
141
|
-
depth = T.let(0, Integer)
|
|
142
|
-
in_single_quote = T.let(false, T::Boolean)
|
|
143
|
-
in_double_quote = T.let(false, T::Boolean)
|
|
144
|
-
i = T.let(0, Integer)
|
|
145
|
-
|
|
146
|
-
while i < expression.length
|
|
147
|
-
char = T.must(expression[i])
|
|
148
|
-
|
|
149
|
-
in_single_quote, in_double_quote, quote_toggled =
|
|
150
|
-
toggle_quote_state(char, in_single_quote, in_double_quote)
|
|
151
|
-
if quote_toggled
|
|
152
|
-
token << char
|
|
153
|
-
i += 1
|
|
154
|
-
next
|
|
155
|
-
end
|
|
156
|
-
|
|
157
|
-
depth = update_depth_for_unquoted_char(char, depth, in_single_quote, in_double_quote)
|
|
158
|
-
|
|
159
|
-
if depth.zero? && !in_single_quote && !in_double_quote && word_at?(expression, i, operator)
|
|
160
|
-
parts << token.strip
|
|
161
|
-
token = +""
|
|
162
|
-
i += operator.length
|
|
163
|
-
next
|
|
164
|
-
end
|
|
165
|
-
|
|
166
|
-
token << char
|
|
167
|
-
i += 1
|
|
168
|
-
end
|
|
169
|
-
|
|
170
|
-
parts << token.strip
|
|
171
|
-
parts
|
|
172
|
-
end
|
|
173
|
-
|
|
174
|
-
sig do
|
|
175
|
-
params(
|
|
176
|
-
char: String,
|
|
177
|
-
depth: Integer,
|
|
178
|
-
in_single_quote: T::Boolean,
|
|
179
|
-
in_double_quote: T::Boolean
|
|
180
|
-
).returns(Integer)
|
|
181
|
-
end
|
|
182
|
-
def update_depth_for_unquoted_char(char, depth, in_single_quote, in_double_quote)
|
|
183
|
-
return depth if in_single_quote || in_double_quote
|
|
184
|
-
|
|
185
|
-
depth += 1 if char == "("
|
|
186
|
-
depth -= 1 if char == ")"
|
|
187
|
-
depth
|
|
188
|
-
end
|
|
189
|
-
|
|
190
|
-
sig { params(expression: String, index: Integer, word: String).returns(T::Boolean) }
|
|
191
|
-
def word_at?(expression, index, word)
|
|
192
|
-
return false unless expression[index, word.length] == word
|
|
193
|
-
|
|
194
|
-
before = index.zero? ? " " : T.must(expression[index - 1])
|
|
195
|
-
after_index = index + word.length
|
|
196
|
-
after = after_index >= expression.length ? " " : T.must(expression[after_index])
|
|
197
|
-
|
|
198
|
-
word_boundary?(before) && word_boundary?(after)
|
|
199
|
-
end
|
|
200
|
-
|
|
201
|
-
sig { params(char: String).returns(T::Boolean) }
|
|
202
|
-
def word_boundary?(char)
|
|
203
|
-
!!(char =~ /[^A-Za-z0-9_]/)
|
|
204
|
-
end
|
|
205
|
-
|
|
206
|
-
sig do
|
|
207
|
-
params(
|
|
208
|
-
condition: T.nilable(String),
|
|
209
|
-
python_version: String,
|
|
210
|
-
default: T::Boolean
|
|
211
|
-
).returns(T::Boolean)
|
|
212
|
-
end
|
|
213
|
-
def evaluate_python_version_condition(condition, python_version, default:)
|
|
214
|
-
return default if condition.nil?
|
|
215
|
-
|
|
216
|
-
candidate = strip_wrapping_parentheses(condition.strip)
|
|
217
|
-
match = candidate.match(/\Apython(?:_full)?_version\s*(<=|>=|<|>|==|!=)\s*['\"]([^'\"]+)['\"]\z/)
|
|
218
|
-
return default unless match
|
|
219
|
-
|
|
220
|
-
operator = T.must(match[1])
|
|
221
|
-
version = T.must(match[2])
|
|
222
|
-
lhs = Dependabot::Python::Version.new(python_version)
|
|
223
|
-
rhs = Dependabot::Python::Version.new(version)
|
|
224
|
-
|
|
225
|
-
case operator
|
|
226
|
-
when "<" then lhs < rhs
|
|
227
|
-
when "<=" then lhs <= rhs
|
|
228
|
-
when ">" then lhs > rhs
|
|
229
|
-
when ">=" then lhs >= rhs
|
|
230
|
-
when "==" then lhs == rhs
|
|
231
|
-
when "!=" then lhs != rhs
|
|
232
|
-
else false
|
|
233
|
-
end
|
|
234
|
-
rescue ArgumentError
|
|
235
|
-
true
|
|
236
|
-
end
|
|
237
|
-
end
|
|
238
|
-
end
|
|
239
|
-
end
|
|
240
|
-
end
|
|
241
|
-
end
|