Skip to content

Commit

Permalink
style: format code with Black, isort and Ruff Formatter (#269)
Browse files Browse the repository at this point in the history 
* style: format code with Black, isort and Ruff Formatter

This commit fixes the style issues introduced in 4672ac0 according to the output
from Black, isort and Ruff Formatter.

Details: None

* Add test for handling first commit in check suite

In tests/events/test_check_suite_requested_event.py, a new test has been added to verify the behavior when the checked suite is the very first commit of the branch. It specifically checks that no release is created and the correct check run progression is initiated.

* style: format code with Black, isort and Ruff Formatter

This commit fixes the style issues introduced in c463fc9 according to the output
from Black, isort and Ruff Formatter.

Details: #269

---------

Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Co-authored-by: Heitor Polidoro <heitor.polidoro@gmail.com>
  • Loading branch information
@deepsource-autofix @heitorpolidoro
deepsource-autofix[bot] and heitorpolidoro authored Jul 19, 2024
1 parent 2f004b1 commit ca98292
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 26 deletions.
8 changes: 6 additions & 2 deletions app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ def sentry_init() -> None: # pragma: no cover

app = Flask(__name__)
sentry_init()
webhook_handler.handle_with_flask(app, use_default_index=False, config_file=".bartholomew.yaml")
webhook_handler.handle_with_flask(
app, use_default_index=False, config_file=".bartholomew.yaml"
)

load_dotenv()
default_configs()
Expand Down Expand Up @@ -101,7 +103,9 @@ def process_jobs_endpoint(issue_url: str = None) -> tuple[Response, int]:
if issue_job := next(iter(IssueJobService.filter(issue_url=issue_url)), None):
if process.is_alive():
IssueJobService.update(issue_job, issue_job_status=IssueJobStatus.PENDING)
request_helper.make_thread_request(request_helper.get_request_url("process_jobs_endpoint"), issue_url)
request_helper.make_thread_request(
request_helper.get_request_url("process_jobs_endpoint"), issue_url
)
process.terminate()
return jsonify({"status": issue_job.issue_job_status.value}), 200
return jsonify({"error": f"IssueJob for {issue_url=} not found"}), 404
Expand Down
121 changes: 97 additions & 24 deletions tests/events/test_check_suite_requested_event.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ def get_final_summary(state):
)

if final_create_pull_request:
if final_create_pull_request.pop("conclusion", None) != CheckRunConclusion.SKIPPED:
if (
final_create_pull_request.pop("conclusion", None)
!= CheckRunConclusion.SKIPPED
):
self.assert_sub_run_call(
check_run_name,
"Create Pull Request",
Expand All @@ -84,16 +87,24 @@ def get_final_summary(state):
)

if final_enable_auto_merge:
if final_enable_auto_merge.pop("conclusion", None) != CheckRunConclusion.SKIPPED:
if (
final_enable_auto_merge.pop("conclusion", None)
!= CheckRunConclusion.SKIPPED
):
self.assert_sub_run_call(
check_run_name,
"Enable auto-merge",
title="Enabling auto-merge",
)
self.assert_sub_run_call(check_run_name, "Enable auto-merge", **final_enable_auto_merge)
self.assert_sub_run_call(
check_run_name, "Enable auto-merge", **final_enable_auto_merge
)

if final_auto_update_pull_requests:
if final_auto_update_pull_requests.pop("conclusion", None) != CheckRunConclusion.SKIPPED:
if (
final_auto_update_pull_requests.pop("conclusion", None)
!= CheckRunConclusion.SKIPPED
):
self.assert_sub_run_call(
check_run_name,
"Auto Update Pull Requests",
Expand All @@ -115,7 +126,9 @@ def get_final_summary(state):
)

def test_when_head_branch_is_not_default_branch(self):
event = self.deliver(self.event_type, check_suite={"head_branch": "feature_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "feature_branch"}
)

event.repository.create_pull.assert_called_once_with(
"default_branch",
Expand Down Expand Up @@ -147,7 +160,9 @@ def test_when_a_pull_request_already_exists(self):
),
),
):
event = self.deliver(self.event_type, check_suite={"head_branch": "feature_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "feature_branch"}
)

event.repository.create_pull.assert_called_once_with(
"default_branch",
Expand Down Expand Up @@ -177,7 +192,9 @@ def test_when_create_pull_request_is_disabled(self):
False,
),
):
event = self.deliver(self.event_type, check_suite={"head_branch": "feature_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "feature_branch"}
)
event.repository.create_pull.assert_not_called()
self.pull_request.enable_automerge.assert_called_once_with(
merge_method=Config.pull_request_manager.merge_method
Expand All @@ -203,7 +220,9 @@ def test_when_create_pull_request_is_disabled_and_there_is_no_pull_request(self)
),
patch.object(Repository, "get_pulls", return_value=[]),
):
event = self.deliver(self.event_type, check_suite={"head_branch": "feature_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "feature_branch"}
)
event.repository.create_pull.assert_not_called()
self.pull_request.enable_automerge.assert_not_called()
self.pull_request.create_review.assert_not_called()
Expand Down Expand Up @@ -236,7 +255,9 @@ def test_when_create_pull_request_and_auto_merge_are_disabled(self):
False,
),
):
event = self.deliver(self.event_type, check_suite={"head_branch": "feature_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "feature_branch"}
)
event.repository.create_pull.assert_not_called()
self.pull_request.enable_automerge.assert_not_called()
self.pull_request.create_review.assert_not_called()
Expand All @@ -256,7 +277,9 @@ def test_when_create_pull_request_and_auto_merge_are_disabled(self):
self.assert_no_check_run("Releaser")

def test_when_head_branch_is_default_branch(self):
event = self.deliver(self.event_type, check_suite={"head_branch": "default_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "default_branch"}
)
event.repository.create_pull.assert_not_called()
self.pull_request.enable_automerge.assert_not_called()
self.pull_request.create_review.assert_not_called()
Expand Down Expand Up @@ -345,7 +368,9 @@ def test_when_an_error_happens_when_enabling_auto_merge(self):
self.assert_no_check_run("Releaser")

def test_when_an_the_default_branch_is_not_protected(self):
with (patch.object(Repository, "get_branch", return_value=Mock(protected=False)),):
with (
patch.object(Repository, "get_branch", return_value=Mock(protected=False)),
):
event = self.deliver(
self.event_type,
check_suite={"head_branch": "feature_branch"},
Expand Down Expand Up @@ -413,7 +438,9 @@ def test_update_pull_requests(self):
"get_pulls",
return_value=[ahead_pull_request] + behind_pull_requests,
):
event = self.deliver(self.event_type, check_suite={"head_branch": "default_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "default_branch"}
)
event.repository.create_pull.assert_not_called()
self.pull_request.enable_automerge.assert_not_called()
self.pull_request.create_review.assert_not_called()
Expand Down Expand Up @@ -442,7 +469,9 @@ def test_auto_update_is_disabled(self):
"auto_update",
False,
):
event = self.deliver(self.event_type, check_suite={"head_branch": "default_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "default_branch"}
)
event.repository.create_pull.assert_not_called()
self.pull_request.enable_automerge.assert_not_called()
self.pull_request.create_review.assert_not_called()
Expand Down Expand Up @@ -485,6 +514,28 @@ def test_release_manager_with_no_command(self):
],
)

def test_when_head_branch_is_first_commits(self):
with (
patch.object(Config.release_manager, "enabled", True),
patch.object(Config.pull_request_manager, "enabled", False),
):
event = self.deliver(
self.event_type,
check_suite={
"head_branch": "default_branch",
"before": "0000000000000000000000000000000000000000",
},
)
event.repository.create_git_release.assert_not_called()
self.assert_no_check_run("Pull Request Manager")
self.assert_check_run_progression(
"Releaser",
[
call(title="Initializing...", status=CheckRunStatus.IN_PROGRESS),
call(title="First commit", conclusion=CheckRunConclusion.SUCCESS),
],
)

def test_release_manager_with_command(self):
compare = Mock()
compare.commits.reversed = [Mock(commit=Mock(message="[release:1.2.3]"))]
Expand All @@ -494,15 +545,19 @@ def test_release_manager_with_command(self):
patch.object(Repository, "compare", return_value=compare),
):
event = self.deliver(self.event_type)
event.repository.create_git_release.assert_called_once_with(tag="1.2.3", generate_release_notes=True)
event.repository.create_git_release.assert_called_once_with(
tag="1.2.3", generate_release_notes=True
)
self.assert_no_check_run("Pull Request Manager")
self.assert_check_run_progression(
"Releaser",
[
call(title="Initializing...", status=CheckRunStatus.IN_PROGRESS),
call(title="Checking for release command..."),
call(title="Releasing 1.2.3..."),
call(title="1.2.3 released ✅", conclusion=CheckRunConclusion.SUCCESS),
call(
title="1.2.3 released ✅", conclusion=CheckRunConclusion.SUCCESS
),
],
)

Expand All @@ -520,15 +575,19 @@ def test_release_manager_get_last_command(self):
patch.object(Repository, "compare", return_value=compare),
):
event = self.deliver(self.event_type)
event.repository.create_git_release.assert_called_once_with(tag="3.2.1", generate_release_notes=True)
event.repository.create_git_release.assert_called_once_with(
tag="3.2.1", generate_release_notes=True
)
self.assert_no_check_run("Pull Request Manager")
self.assert_check_run_progression(
"Releaser",
[
call(title="Initializing...", status=CheckRunStatus.IN_PROGRESS),
call(title="Checking for release command..."),
call(title="Releasing 3.2.1..."),
call(title="3.2.1 released ✅", conclusion=CheckRunConclusion.SUCCESS),
call(
title="3.2.1 released ✅", conclusion=CheckRunConclusion.SUCCESS
),
],
)

Expand All @@ -539,18 +598,24 @@ def test_release_manager_with_relative_release(self):
patch.object(Config.release_manager, "enabled", True),
patch.object(Config.pull_request_manager, "enabled", False),
patch.object(Repository, "compare", return_value=compare),
patch.object(Repository, "get_latest_release", return_value=Mock(tag_name="1.2.3")),
patch.object(
Repository, "get_latest_release", return_value=Mock(tag_name="1.2.3")
),
):
event = self.deliver(self.event_type)
event.repository.create_git_release.assert_called_once_with(tag="1.3.0", generate_release_notes=True)
event.repository.create_git_release.assert_called_once_with(
tag="1.3.0", generate_release_notes=True
)
self.assert_no_check_run("Pull Request Manager")
self.assert_check_run_progression(
"Releaser",
[
call(title="Initializing...", status=CheckRunStatus.IN_PROGRESS),
call(title="Checking for release command..."),
call(title="Releasing 1.3.0..."),
call(title="1.3.0 released ✅", conclusion=CheckRunConclusion.SUCCESS),
call(
title="1.3.0 released ✅", conclusion=CheckRunConclusion.SUCCESS
),
],
)

Expand All @@ -561,7 +626,9 @@ def test_release_manager_with_invalid_release(self):
patch.object(Config.release_manager, "enabled", True),
patch.object(Config.pull_request_manager, "enabled", False),
patch.object(Repository, "compare", return_value=compare),
patch.object(Repository, "get_latest_release", return_value=Mock(tag_name="1.2.3")),
patch.object(
Repository, "get_latest_release", return_value=Mock(tag_name="1.2.3")
),
):
event = self.deliver(self.event_type)
event.repository.create_git_release.assert_not_called()
Expand All @@ -580,12 +647,16 @@ def test_release_manager_with_invalid_release(self):
)

def test_release_manager_with_command_in_feature_branch(self):
self.pull_request.get_commits().reversed = [Mock(commit=Mock(message="[release:1.2.3]"))]
self.pull_request.get_commits().reversed = [
Mock(commit=Mock(message="[release:1.2.3]"))
]
with (
patch.object(Config.release_manager, "enabled", True),
patch.object(Config.pull_request_manager, "enabled", False),
):
event = self.deliver(self.event_type, check_suite={"head_branch": "feature_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "feature_branch"}
)
event.repository.create_git_release.assert_not_called()
self.assert_no_check_run("Pull Request Manager")
self.assert_check_run_progression(
Expand All @@ -607,7 +678,9 @@ def test_release_manager_with_no_pull_request_in_feature_branch(self):
patch.object(Config.pull_request_manager, "enabled", False),
patch.object(Repository, "get_pulls", return_value=[]),
):
event = self.deliver(self.event_type, check_suite={"head_branch": "feature_branch"})
event = self.deliver(
self.event_type, check_suite={"head_branch": "feature_branch"}
)
event.repository.create_git_release.assert_not_called()
self.assert_no_check_run("Pull Request Manager")
self.assert_check_run_progression(
Expand Down

0 comments on commit ca98292

Please # to comment.