Skip to content

Commit e5741db

Browse files
dependabot[bot]pedjaradenkovic
authored andcommitted
Bump black from 24.3.0 to 26.3.1
Bumps [black](https://github.com/psf/black) from 24.3.0 to 26.3.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@24.3.0...26.3.1) --- updated-dependencies: - dependency-name: black dependency-version: 26.3.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent c7dea68 commit e5741db

4 files changed

Lines changed: 26 additions & 50 deletions

File tree

file_utils.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,15 @@ def load_linked_resources(template_dirs: list[str], resources_list):
236236
content = open_from(template_dirs, file_name)
237237

238238
if content is None:
239-
raise FileNotFoundError(
240-
f"""
239+
raise FileNotFoundError(f"""
241240
Resource file {file_name} not found. Resource files are searched in the following order (highest to lowest precedence):
242241
243242
1. The directory containing your .plain file
244243
2. The directory specified by --template-dir (if provided)
245244
3. The built-in 'standard_template_library' directory
246245
247246
Please ensure that the resource exists in one of these locations, or specify the correct --template-dir if using custom templates.
248-
"""
249-
)
247+
""")
250248

251249
linked_resources[file_name] = content
252250

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
dev = [
3333
"pytest==8.3.5",
3434
"flake8==7.0.0",
35-
"black==24.3.0",
35+
"black==26.3.1",
3636
"isort==5.13.2",
3737
"mypy==1.11.2",
3838
]

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ transitions==0.9.3
1414

1515
# Development dependencies
1616
flake8==7.0.0
17-
black==24.3.0
17+
black==26.3.1
1818
isort==5.13.2
1919
mypy==1.11.2

tests/test_git_utils.py

Lines changed: 22 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,15 @@ def test_single_file_change(temp_repo):
6363
result = diff(temp_repo, "1.1")
6464

6565
assert "test.txt" in result
66-
expected_diff = dedent(
67-
"""
66+
expected_diff = dedent("""
6867
--- a/test.txt
6968
+++ b/test.txt
7069
@@ -1,3 +1,3 @@
7170
-initial content
7271
+modified content
7372
line2
7473
line3
75-
"""
76-
).strip()
74+
""").strip()
7775
assert result["test.txt"] == expected_diff
7876

7977

@@ -98,31 +96,27 @@ def test_multiple_file_changes(temp_repo):
9896

9997
# Check first file
10098
assert "test.txt" in result
101-
expected_diff1 = dedent(
102-
"""
99+
expected_diff1 = dedent("""
103100
--- a/test.txt
104101
+++ b/test.txt
105102
@@ -1,3 +1,2 @@
106103
-initial content
107104
+file1 modified
108105
line2
109106
-line3
110-
"""
111-
).strip()
107+
""").strip()
112108
assert result["test.txt"] == expected_diff1
113109

114110
# Check second file
115111
assert "file2.txt" in result
116-
expected_diff2 = dedent(
117-
"""
112+
expected_diff2 = dedent("""
118113
--- /dev/null
119114
+++ b/file2.txt
120115
@@ -0,0 +1,2 @@
121116
+file2 modified
122117
+line2
123118
\\ No newline at end of file
124-
"""
125-
).strip()
119+
""").strip()
126120
assert result["file2.txt"] == expected_diff2
127121

128122

@@ -157,44 +151,38 @@ def test_multiple_commits_diff(temp_repo):
157151

158152
# Check first file
159153
assert "test.txt" in result
160-
expected_diff1 = dedent(
161-
"""
154+
expected_diff1 = dedent("""
162155
--- a/test.txt
163156
+++ b/test.txt
164157
@@ -1,3 +1,2 @@
165158
-initial content
166159
+file1 frid1.2 refactored version
167160
line2
168161
-line3
169-
"""
170-
).strip()
162+
""").strip()
171163
assert result["test.txt"] == expected_diff1
172164

173165
# Check second file
174166
assert "file2.txt" in result
175-
expected_diff2 = dedent(
176-
"""
167+
expected_diff2 = dedent("""
177168
--- a/file2.txt
178169
+++ b/file2.txt
179170
@@ -1,2 +1,2 @@
180171
-file2 frid1.1 refactored version
181172
+file2 frid1.2 version
182173
line2
183-
"""
184-
).strip()
174+
""").strip()
185175
assert result["file2.txt"] == expected_diff2
186176

187177
# Check third file
188178
assert "file3.txt" in result
189-
expected_diff3 = dedent(
190-
"""
179+
expected_diff3 = dedent("""
191180
--- /dev/null
192181
+++ b/file3.txt
193182
@@ -0,0 +1,2 @@
194183
+file3 frid1.2 new file
195184
+line2
196-
"""
197-
).strip()
185+
""").strip()
198186
assert result["file3.txt"] == expected_diff3
199187

200188

@@ -213,27 +201,23 @@ def test_diff_without_previous_frid_and_no_base_folder(empty_repo):
213201
result = diff(empty_repo)
214202

215203
assert "new.txt" in result
216-
expected_diff = dedent(
217-
"""
204+
expected_diff = dedent("""
218205
--- /dev/null
219206
+++ b/new.txt
220207
@@ -0,0 +1,2 @@
221208
+new file content
222209
+line2
223-
"""
224-
).strip()
210+
""").strip()
225211
assert result["new.txt"] == expected_diff
226212

227213
assert "new2.txt" in result
228-
expected_diff2 = dedent(
229-
"""
214+
expected_diff2 = dedent("""
230215
--- /dev/null
231216
+++ b/new2.txt
232217
@@ -0,0 +1,2 @@
233218
+new file content
234219
+line2
235-
"""
236-
).strip()
220+
""").strip()
237221
assert result["new2.txt"] == expected_diff2
238222

239223

@@ -251,16 +235,14 @@ def test_diff_without_previous_frid_and_base_folder(temp_repo):
251235
result = diff(temp_repo)
252236

253237
assert "new.txt" in result
254-
expected_diff = dedent(
255-
"""
238+
expected_diff = dedent("""
256239
--- a/new.txt
257240
+++ b/new.txt
258241
@@ -1,2 +1,2 @@
259242
-base folder content
260243
+updated base folder content
261244
line2
262-
"""
263-
).strip()
245+
""").strip()
264246
assert result["new.txt"] == expected_diff
265247

266248

@@ -276,15 +258,13 @@ def test_new_file(temp_repo):
276258
result = diff(temp_repo, "1.1")
277259

278260
assert "new.txt" in result
279-
expected_diff = dedent(
280-
"""
261+
expected_diff = dedent("""
281262
--- /dev/null
282263
+++ b/new.txt
283264
@@ -0,0 +1,2 @@
284265
+new file content
285266
+line2
286-
"""
287-
).strip()
267+
""").strip()
288268
assert result["new.txt"] == expected_diff
289269

290270

@@ -300,16 +280,14 @@ def test_deleted_file(temp_repo):
300280
result = diff(temp_repo, "1.1")
301281

302282
assert "test.txt" in result
303-
expected_diff = dedent(
304-
"""
283+
expected_diff = dedent("""
305284
--- a/test.txt
306285
+++ /dev/null
307286
@@ -1,3 +0,0 @@
308287
-initial content
309288
-line2
310289
-line3
311-
"""
312-
).strip()
290+
""").strip()
313291
assert result["test.txt"] == expected_diff
314292

315293

0 commit comments

Comments
 (0)