From e5741db58e1540de9e656d50dae974b844225a51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2026 19:14:49 +0000 Subject: [PATCH] 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](https://github.com/psf/black/compare/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] --- file_utils.py | 6 ++-- pyproject.toml | 2 +- requirements.txt | 2 +- tests/test_git_utils.py | 66 ++++++++++++++--------------------------- 4 files changed, 26 insertions(+), 50 deletions(-) diff --git a/file_utils.py b/file_utils.py index 05ed630..d8c9ef9 100644 --- a/file_utils.py +++ b/file_utils.py @@ -236,8 +236,7 @@ def load_linked_resources(template_dirs: list[str], resources_list): content = open_from(template_dirs, file_name) if content is None: - raise FileNotFoundError( - f""" + raise FileNotFoundError(f""" Resource file {file_name} not found. Resource files are searched in the following order (highest to lowest precedence): 1. The directory containing your .plain file @@ -245,8 +244,7 @@ def load_linked_resources(template_dirs: list[str], resources_list): 3. The built-in 'standard_template_library' directory Please ensure that the resource exists in one of these locations, or specify the correct --template-dir if using custom templates. - """ - ) + """) linked_resources[file_name] = content diff --git a/pyproject.toml b/pyproject.toml index 9efc47c..664ba4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ dependencies = [ dev = [ "pytest==8.3.5", "flake8==7.0.0", - "black==24.3.0", + "black==26.3.1", "isort==5.13.2", "mypy==1.11.2", ] diff --git a/requirements.txt b/requirements.txt index 61c882c..fc0b81a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,6 +14,6 @@ transitions==0.9.3 # Development dependencies flake8==7.0.0 -black==24.3.0 +black==26.3.1 isort==5.13.2 mypy==1.11.2 diff --git a/tests/test_git_utils.py b/tests/test_git_utils.py index 59a1d99..0fc7b6f 100644 --- a/tests/test_git_utils.py +++ b/tests/test_git_utils.py @@ -63,8 +63,7 @@ def test_single_file_change(temp_repo): result = diff(temp_repo, "1.1") assert "test.txt" in result - expected_diff = dedent( - """ + expected_diff = dedent(""" --- a/test.txt +++ b/test.txt @@ -1,3 +1,3 @@ @@ -72,8 +71,7 @@ def test_single_file_change(temp_repo): +modified content line2 line3 - """ - ).strip() + """).strip() assert result["test.txt"] == expected_diff @@ -98,8 +96,7 @@ def test_multiple_file_changes(temp_repo): # Check first file assert "test.txt" in result - expected_diff1 = dedent( - """ + expected_diff1 = dedent(""" --- a/test.txt +++ b/test.txt @@ -1,3 +1,2 @@ @@ -107,22 +104,19 @@ def test_multiple_file_changes(temp_repo): +file1 modified line2 -line3 - """ - ).strip() + """).strip() assert result["test.txt"] == expected_diff1 # Check second file assert "file2.txt" in result - expected_diff2 = dedent( - """ + expected_diff2 = dedent(""" --- /dev/null +++ b/file2.txt @@ -0,0 +1,2 @@ +file2 modified +line2 \\ No newline at end of file - """ - ).strip() + """).strip() assert result["file2.txt"] == expected_diff2 @@ -157,8 +151,7 @@ def test_multiple_commits_diff(temp_repo): # Check first file assert "test.txt" in result - expected_diff1 = dedent( - """ + expected_diff1 = dedent(""" --- a/test.txt +++ b/test.txt @@ -1,3 +1,2 @@ @@ -166,35 +159,30 @@ def test_multiple_commits_diff(temp_repo): +file1 frid1.2 refactored version line2 -line3 - """ - ).strip() + """).strip() assert result["test.txt"] == expected_diff1 # Check second file assert "file2.txt" in result - expected_diff2 = dedent( - """ + expected_diff2 = dedent(""" --- a/file2.txt +++ b/file2.txt @@ -1,2 +1,2 @@ -file2 frid1.1 refactored version +file2 frid1.2 version line2 - """ - ).strip() + """).strip() assert result["file2.txt"] == expected_diff2 # Check third file assert "file3.txt" in result - expected_diff3 = dedent( - """ + expected_diff3 = dedent(""" --- /dev/null +++ b/file3.txt @@ -0,0 +1,2 @@ +file3 frid1.2 new file +line2 - """ - ).strip() + """).strip() assert result["file3.txt"] == expected_diff3 @@ -213,27 +201,23 @@ def test_diff_without_previous_frid_and_no_base_folder(empty_repo): result = diff(empty_repo) assert "new.txt" in result - expected_diff = dedent( - """ + expected_diff = dedent(""" --- /dev/null +++ b/new.txt @@ -0,0 +1,2 @@ +new file content +line2 - """ - ).strip() + """).strip() assert result["new.txt"] == expected_diff assert "new2.txt" in result - expected_diff2 = dedent( - """ + expected_diff2 = dedent(""" --- /dev/null +++ b/new2.txt @@ -0,0 +1,2 @@ +new file content +line2 - """ - ).strip() + """).strip() assert result["new2.txt"] == expected_diff2 @@ -251,16 +235,14 @@ def test_diff_without_previous_frid_and_base_folder(temp_repo): result = diff(temp_repo) assert "new.txt" in result - expected_diff = dedent( - """ + expected_diff = dedent(""" --- a/new.txt +++ b/new.txt @@ -1,2 +1,2 @@ -base folder content +updated base folder content line2 - """ - ).strip() + """).strip() assert result["new.txt"] == expected_diff @@ -276,15 +258,13 @@ def test_new_file(temp_repo): result = diff(temp_repo, "1.1") assert "new.txt" in result - expected_diff = dedent( - """ + expected_diff = dedent(""" --- /dev/null +++ b/new.txt @@ -0,0 +1,2 @@ +new file content +line2 - """ - ).strip() + """).strip() assert result["new.txt"] == expected_diff @@ -300,16 +280,14 @@ def test_deleted_file(temp_repo): result = diff(temp_repo, "1.1") assert "test.txt" in result - expected_diff = dedent( - """ + expected_diff = dedent(""" --- a/test.txt +++ /dev/null @@ -1,3 +0,0 @@ -initial content -line2 -line3 - """ - ).strip() + """).strip() assert result["test.txt"] == expected_diff