豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content

Commit 648da54

Browse files
fix uv dependency resolution error
Release notes: https://github.com/dependabot/dependabot-core/releases/tag/v0.340.1 remove unused code (#13292) remove unused updated_files_regex (#13289)
1 parent ed8dd10 commit 648da54

File tree

57 files changed

+175
-1611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+175
-1611
lines changed

Gemfile.lock

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
PATH
22
remote: bun
33
specs:
4-
dependabot-bun (0.340.0)
5-
dependabot-common (= 0.340.0)
4+
dependabot-bun (0.340.1)
5+
dependabot-common (= 0.340.1)
66

77
PATH
88
remote: bundler
99
specs:
10-
dependabot-bundler (0.340.0)
11-
dependabot-common (= 0.340.0)
10+
dependabot-bundler (0.340.1)
11+
dependabot-common (= 0.340.1)
1212
parallel (~> 1.24)
1313

1414
PATH
1515
remote: cargo
1616
specs:
17-
dependabot-cargo (0.340.0)
18-
dependabot-common (= 0.340.0)
17+
dependabot-cargo (0.340.1)
18+
dependabot-common (= 0.340.1)
1919

2020
PATH
2121
remote: common
2222
specs:
23-
dependabot-common (0.340.0)
23+
dependabot-common (0.340.1)
2424
aws-sdk-codecommit (~> 1.28)
2525
aws-sdk-ecr (~> 1.5)
2626
bundler (>= 1.16, < 3.0.0)
@@ -46,152 +46,152 @@ PATH
4646
PATH
4747
remote: composer
4848
specs:
49-
dependabot-composer (0.340.0)
50-
dependabot-common (= 0.340.0)
49+
dependabot-composer (0.340.1)
50+
dependabot-common (= 0.340.1)
5151

5252
PATH
5353
remote: conda
5454
specs:
55-
dependabot-conda (0.340.0)
56-
dependabot-common (= 0.340.0)
57-
dependabot-python (= 0.340.0)
55+
dependabot-conda (0.340.1)
56+
dependabot-common (= 0.340.1)
57+
dependabot-python (= 0.340.1)
5858

5959
PATH
6060
remote: devcontainers
6161
specs:
62-
dependabot-devcontainers (0.340.0)
63-
dependabot-common (= 0.340.0)
62+
dependabot-devcontainers (0.340.1)
63+
dependabot-common (= 0.340.1)
6464

6565
PATH
6666
remote: docker_compose
6767
specs:
68-
dependabot-docker_compose (0.340.0)
69-
dependabot-common (= 0.340.0)
70-
dependabot-docker (= 0.340.0)
68+
dependabot-docker_compose (0.340.1)
69+
dependabot-common (= 0.340.1)
70+
dependabot-docker (= 0.340.1)
7171

7272
PATH
7373
remote: docker
7474
specs:
75-
dependabot-docker (0.340.0)
76-
dependabot-common (= 0.340.0)
75+
dependabot-docker (0.340.1)
76+
dependabot-common (= 0.340.1)
7777

7878
PATH
7979
remote: dotnet_sdk
8080
specs:
81-
dependabot-dotnet_sdk (0.340.0)
82-
dependabot-common (= 0.340.0)
81+
dependabot-dotnet_sdk (0.340.1)
82+
dependabot-common (= 0.340.1)
8383

8484
PATH
8585
remote: elm
8686
specs:
87-
dependabot-elm (0.340.0)
88-
dependabot-common (= 0.340.0)
87+
dependabot-elm (0.340.1)
88+
dependabot-common (= 0.340.1)
8989

9090
PATH
9191
remote: git_submodules
9292
specs:
93-
dependabot-git_submodules (0.340.0)
94-
dependabot-common (= 0.340.0)
93+
dependabot-git_submodules (0.340.1)
94+
dependabot-common (= 0.340.1)
9595
parseconfig (~> 1.0, < 1.1.0)
9696

9797
PATH
9898
remote: github_actions
9999
specs:
100-
dependabot-github_actions (0.340.0)
101-
dependabot-common (= 0.340.0)
100+
dependabot-github_actions (0.340.1)
101+
dependabot-common (= 0.340.1)
102102

103103
PATH
104104
remote: go_modules
105105
specs:
106-
dependabot-go_modules (0.340.0)
107-
dependabot-common (= 0.340.0)
106+
dependabot-go_modules (0.340.1)
107+
dependabot-common (= 0.340.1)
108108

109109
PATH
110110
remote: gradle
111111
specs:
112-
dependabot-gradle (0.340.0)
113-
dependabot-common (= 0.340.0)
114-
dependabot-maven (= 0.340.0)
112+
dependabot-gradle (0.340.1)
113+
dependabot-common (= 0.340.1)
114+
dependabot-maven (= 0.340.1)
115115

116116
PATH
117117
remote: helm
118118
specs:
119-
dependabot-helm (0.340.0)
120-
dependabot-common (= 0.340.0)
121-
dependabot-docker (= 0.340.0)
119+
dependabot-helm (0.340.1)
120+
dependabot-common (= 0.340.1)
121+
dependabot-docker (= 0.340.1)
122122

123123
PATH
124124
remote: hex
125125
specs:
126-
dependabot-hex (0.340.0)
127-
dependabot-common (= 0.340.0)
126+
dependabot-hex (0.340.1)
127+
dependabot-common (= 0.340.1)
128128

129129
PATH
130130
remote: maven
131131
specs:
132-
dependabot-maven (0.340.0)
133-
dependabot-common (= 0.340.0)
132+
dependabot-maven (0.340.1)
133+
dependabot-common (= 0.340.1)
134134
rexml (~> 3.4.1)
135135

136136
PATH
137137
remote: npm_and_yarn
138138
specs:
139-
dependabot-npm_and_yarn (0.340.0)
140-
dependabot-common (= 0.340.0)
139+
dependabot-npm_and_yarn (0.340.1)
140+
dependabot-common (= 0.340.1)
141141

142142
PATH
143143
remote: nuget
144144
specs:
145-
dependabot-nuget (0.340.0)
146-
dependabot-common (= 0.340.0)
145+
dependabot-nuget (0.340.1)
146+
dependabot-common (= 0.340.1)
147147

148148
PATH
149149
remote: pub
150150
specs:
151-
dependabot-pub (0.340.0)
152-
dependabot-common (= 0.340.0)
151+
dependabot-pub (0.340.1)
152+
dependabot-common (= 0.340.1)
153153

154154
PATH
155155
remote: python
156156
specs:
157-
dependabot-python (0.340.0)
158-
dependabot-common (= 0.340.0)
157+
dependabot-python (0.340.1)
158+
dependabot-common (= 0.340.1)
159159

160160
PATH
161161
remote: rust_toolchain
162162
specs:
163-
dependabot-rust_toolchain (0.340.0)
164-
dependabot-common (= 0.340.0)
163+
dependabot-rust_toolchain (0.340.1)
164+
dependabot-common (= 0.340.1)
165165

166166
PATH
167167
remote: silent
168168
specs:
169-
dependabot-silent (0.340.0)
170-
dependabot-common (= 0.340.0)
169+
dependabot-silent (0.340.1)
170+
dependabot-common (= 0.340.1)
171171

172172
PATH
173173
remote: swift
174174
specs:
175-
dependabot-swift (0.340.0)
176-
dependabot-common (= 0.340.0)
175+
dependabot-swift (0.340.1)
176+
dependabot-common (= 0.340.1)
177177

178178
PATH
179179
remote: terraform
180180
specs:
181-
dependabot-terraform (0.340.0)
182-
dependabot-common (= 0.340.0)
181+
dependabot-terraform (0.340.1)
182+
dependabot-common (= 0.340.1)
183183

184184
PATH
185185
remote: uv
186186
specs:
187-
dependabot-uv (0.340.0)
188-
dependabot-common (= 0.340.0)
187+
dependabot-uv (0.340.1)
188+
dependabot-common (= 0.340.1)
189189

190190
PATH
191191
remote: vcpkg
192192
specs:
193-
dependabot-vcpkg (0.340.0)
194-
dependabot-common (= 0.340.0)
193+
dependabot-vcpkg (0.340.1)
194+
dependabot-common (= 0.340.1)
195195

196196
GEM
197197
remote: https://rubygems.org/
@@ -511,34 +511,34 @@ CHECKSUMS
511511
csv (3.3.0) sha256=0bbd1defdc31134abefed027a639b3723c2753862150f4c3ee61cab71b20d67d
512512
date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f
513513
debug (1.9.2) sha256=48e026c0852c7a10c60263e2e527968308958e266231e36d64e3efcabec7e7fc
514-
dependabot-bun (0.340.0)
515-
dependabot-bundler (0.340.0)
516-
dependabot-cargo (0.340.0)
517-
dependabot-common (0.340.0)
518-
dependabot-composer (0.340.0)
519-
dependabot-conda (0.340.0)
520-
dependabot-devcontainers (0.340.0)
521-
dependabot-docker (0.340.0)
522-
dependabot-docker_compose (0.340.0)
523-
dependabot-dotnet_sdk (0.340.0)
524-
dependabot-elm (0.340.0)
525-
dependabot-git_submodules (0.340.0)
526-
dependabot-github_actions (0.340.0)
527-
dependabot-go_modules (0.340.0)
528-
dependabot-gradle (0.340.0)
529-
dependabot-helm (0.340.0)
530-
dependabot-hex (0.340.0)
531-
dependabot-maven (0.340.0)
532-
dependabot-npm_and_yarn (0.340.0)
533-
dependabot-nuget (0.340.0)
534-
dependabot-pub (0.340.0)
535-
dependabot-python (0.340.0)
536-
dependabot-rust_toolchain (0.340.0)
537-
dependabot-silent (0.340.0)
538-
dependabot-swift (0.340.0)
539-
dependabot-terraform (0.340.0)
540-
dependabot-uv (0.340.0)
541-
dependabot-vcpkg (0.340.0)
514+
dependabot-bun (0.340.1)
515+
dependabot-bundler (0.340.1)
516+
dependabot-cargo (0.340.1)
517+
dependabot-common (0.340.1)
518+
dependabot-composer (0.340.1)
519+
dependabot-conda (0.340.1)
520+
dependabot-devcontainers (0.340.1)
521+
dependabot-docker (0.340.1)
522+
dependabot-docker_compose (0.340.1)
523+
dependabot-dotnet_sdk (0.340.1)
524+
dependabot-elm (0.340.1)
525+
dependabot-git_submodules (0.340.1)
526+
dependabot-github_actions (0.340.1)
527+
dependabot-go_modules (0.340.1)
528+
dependabot-gradle (0.340.1)
529+
dependabot-helm (0.340.1)
530+
dependabot-hex (0.340.1)
531+
dependabot-maven (0.340.1)
532+
dependabot-npm_and_yarn (0.340.1)
533+
dependabot-nuget (0.340.1)
534+
dependabot-pub (0.340.1)
535+
dependabot-python (0.340.1)
536+
dependabot-rust_toolchain (0.340.1)
537+
dependabot-silent (0.340.1)
538+
dependabot-swift (0.340.1)
539+
dependabot-terraform (0.340.1)
540+
dependabot-uv (0.340.1)
541+
dependabot-vcpkg (0.340.1)
542542
diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
543543
docile (1.4.0) sha256=5f1734bde23721245c20c3d723e76c104208e1aa01277a69901ce770f0ebb8d3
544544
docker_registry2 (1.18.2) sha256=2ace909110fbca29d69dd1cdec99f555024aa6f6577798638139c8e8e556910f

bun/lib/dependabot/bun/file_updater.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ def sentry_context
3232
end
3333
end
3434

35-
sig { override.returns(T::Array[Regexp]) }
36-
def self.updated_files_regex
37-
[
38-
%r{^(?:.*\/)?package\.json$},
39-
%r{^(?:.*\/)?bun\.lock$}
40-
]
41-
end
42-
4335
sig { override.returns(T::Array[DependencyFile]) }
4436
def updated_dependency_files
4537
updated_files = T.let([], T::Array[DependencyFile])

bun/spec/dependabot/bun/file_updater_spec.rb

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -67,60 +67,6 @@
6767
Dependabot::Experiments.reset!
6868
end
6969

70-
describe "#updated_files_regex" do
71-
subject(:updated_files_regex) { described_class.updated_files_regex }
72-
73-
it "is not empty" do
74-
expect(updated_files_regex).not_to be_empty
75-
end
76-
77-
context "when files match the regex patterns" do
78-
it "returns true for files that should be updated" do
79-
matching_files = [
80-
"package.json",
81-
"subdirectory/package.json",
82-
"apps/dependabot_business/package.json",
83-
"packages/package1/package.json",
84-
"bun.lock",
85-
"subdirectory/bun.lock"
86-
]
87-
88-
matching_files.each do |file_name|
89-
expect(updated_files_regex).to(be_any { |regex| file_name.match?(regex) })
90-
end
91-
end
92-
93-
it "returns false for files that should not be updated" do
94-
non_matching_files = [
95-
"README.md",
96-
".github/workflow/main.yml",
97-
"some_random_file.rb",
98-
"requirements.txt",
99-
"Gemfile",
100-
"Gemfile.lock",
101-
"package-lock.json",
102-
"npm-shrinkwrap.json",
103-
"yarn.lock",
104-
"pnpm-lock.yaml",
105-
"pnpm-workspace.yaml",
106-
"subdirectory/package-lock.json",
107-
"subdirectory/npm-shrinkwrap.json",
108-
"subdirectory/yarn.lock",
109-
"subdirectory/pnpm-lock.yaml",
110-
"packages/package2/yarn.lock",
111-
".yarn/install-state.gz",
112-
".yarn/cache/@es-test-npm-0.46.0-d544b36047-96010ece49.zip",
113-
".pnp.js",
114-
".pnp.cjs"
115-
]
116-
117-
non_matching_files.each do |file_name|
118-
expect(updated_files_regex).not_to(be_any { |regex| file_name.match?(regex) })
119-
end
120-
end
121-
end
122-
end
123-
12470
describe "#updated_dependency_files" do
12571
subject(:updated_files) { updater.updated_dependency_files }
12672

bundler/lib/dependabot/bundler/file_updater.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ class FileUpdater < Dependabot::FileUpdaters::Base
1818
require_relative "file_updater/gemspec_updater"
1919
require_relative "file_updater/lockfile_updater"
2020

21-
sig { override.returns(T::Array[Regexp]) }
22-
def self.updated_files_regex
23-
[
24-
# Matches Gemfile, Gemfile.lock, gems.rb, gems.locked, .gemspec files, and anything in vendor directory
25-
%r{^(Gemfile(\.lock)?|gems\.(rb|locked)|.*\.gemspec|vendor/.*)$},
26-
# Matches the same files in any subdirectory
27-
%r{^.*/(Gemfile|Gemfile\.lock|gems\.rb|gems\.locked)$}
28-
]
29-
end
30-
3121
# rubocop:disable Metrics/PerceivedComplexity
3222
# rubocop:disable Metrics/AbcSize
3323
sig { override.returns(T::Array[Dependabot::DependencyFile]) }

0 commit comments

Comments
 (0)