diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index deff0f987..670d7a845 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,13 +4,13 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.4 + rev: v0.9.2 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - id: ruff-format - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.14.0 + rev: v1.14.1 hooks: - id: mypy args: [ @@ -96,14 +96,14 @@ repos: files: /tests_openshift.*\.yaml$ stages: [manual, pre-push] - repo: https://github.com/gitleaks/gitleaks - rev: v8.22.1 + rev: v8.23.1 hooks: - id: gitleaks # The hook runs 'gitleaks protect --staged' which parses output of # 'git diff --staged', i.e. always passes in pre-push/manual stage. stages: [pre-commit] - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-github-workflows args: ["--verbose"] diff --git a/alembic/versions/a5c06aa9ef30_add_runmodel.py b/alembic/versions/a5c06aa9ef30_add_runmodel.py index 8ac6bbb8a..1dfc8dd3b 100644 --- a/alembic/versions/a5c06aa9ef30_add_runmodel.py +++ b/alembic/versions/a5c06aa9ef30_add_runmodel.py @@ -397,7 +397,7 @@ def upgrade(): for test, build in zip(test_group, matching_builds): if len(build.runs) != 1: PackitException( - f"Build {build} does not have exactly one run:\n" f"{build.runs}", + f"Build {build} does not have exactly one run:\n{build.runs}", ) test_runs_attached += 1 build.runs[-1].test_run = test diff --git a/alembic/versions/a619bd414ff0_add_build_status_enum.py b/alembic/versions/a619bd414ff0_add_build_status_enum.py index 8e0bc6a1b..0807cd2bd 100644 --- a/alembic/versions/a619bd414ff0_add_build_status_enum.py +++ b/alembic/versions/a619bd414ff0_add_build_status_enum.py @@ -25,7 +25,7 @@ def upgrade(): "ALTER COLUMN status TYPE buildstatus USING status::buildstatus", ) op.execute( - "ALTER TABLE srpm_builds " "ALTER COLUMN status TYPE buildstatus USING status::buildstatus", + "ALTER TABLE srpm_builds ALTER COLUMN status TYPE buildstatus USING status::buildstatus", ) diff --git a/alembic/versions/c6250555a36c_.py b/alembic/versions/c6250555a36c_.py index d3e3fdfd3..543c9545c 100644 --- a/alembic/versions/c6250555a36c_.py +++ b/alembic/versions/c6250555a36c_.py @@ -548,7 +548,7 @@ def upgrade(): status = copr_build.get("status") web_url = ( - f"https://copr.fedorainfracloud.org/coprs/{owner}/{project_name}/" f"build/{build_id}/" + f"https://copr.fedorainfracloud.org/coprs/{owner}/{project_name}/build/{build_id}/" ) try: diff --git a/packit_service/constants.py b/packit_service/constants.py index fcfdb0e30..a834899b3 100644 --- a/packit_service/constants.py +++ b/packit_service/constants.py @@ -90,8 +90,7 @@ NOTIFICATION_REPO = "https://github.com/packit/notifications" PERMISSIONS_ERROR_WRITE_OR_ADMIN = ( - "Only users with write or admin permissions to the repository " - "can trigger Packit-as-a-Service" + "Only users with write or admin permissions to the repository can trigger Packit-as-a-Service" ) TASK_ACCEPTED = "The task was accepted." @@ -137,7 +136,7 @@ CELERY_DEFAULT_MAIN_TASK_NAME = "task.steve_jobs.process_message" -MSG_TABLE_HEADER_WITH_DETAILS = "| Name/Job | URL |\n" "| --- | --- |\n" +MSG_TABLE_HEADER_WITH_DETAILS = "| Name/Job | URL |\n| --- | --- |\n" DEFAULT_MAPPING_TF = { "epel-6": "centos-6", diff --git a/packit_service/models.py b/packit_service/models.py index 5228c2799..b7ae69865 100644 --- a/packit_service/models.py +++ b/packit_service/models.py @@ -546,9 +546,7 @@ def get_by_id(cls, id_: int) -> Optional["AnityaMultipleVersionsModel"]: return session.query(AnityaVersionModel).filter_by(id=id_).first() def __repr__(self): - return ( - f"AnityaMultipleVersionsModel(" f"versions={self.versions}, " f"project={self.project})" - ) + return f"AnityaMultipleVersionsModel(versions={self.versions}, project={self.project})" class AnityaVersionModel(BuildsAndTestsConnector, Base): @@ -593,7 +591,7 @@ def get_by_id(cls, id_: int) -> Optional["AnityaVersionModel"]: return session.query(AnityaVersionModel).filter_by(id=id_).first() def __repr__(self): - return f"AnityaVersionModel(" f"version={self.version}, " f"project={self.project})" + return f"AnityaVersionModel(version={self.version}, project={self.project})" class GitProjectModel(Base): @@ -1487,7 +1485,7 @@ def get_by_id(cls, id_: int) -> Optional["ProjectReleaseModel"]: return session.query(ProjectReleaseModel).filter_by(id=id_).first() def __repr__(self): - return f"ProjectReleaseModel(" f"tag_name={self.tag_name}, " f"project={self.project})" + return f"ProjectReleaseModel(tag_name={self.tag_name}, project={self.project})" class KojiBuildTagModel(BuildsAndTestsConnector, Base): @@ -2330,8 +2328,7 @@ def get( def __repr__(self): return ( - f"CoprBuildTargetModel(id={self.id}, " - f"build_submitted_time={self.build_submitted_time})" + f"CoprBuildTargetModel(id={self.id}, build_submitted_time={self.build_submitted_time})" ) def add_scan(self, task_id: int) -> "OSHScanModel": @@ -2789,8 +2786,7 @@ def get( def __repr__(self): return ( - f"KojiBuildTargetModel(id={self.id}, " - f"build_submitted_time={self.build_submitted_time})" + f"KojiBuildTargetModel(id={self.id}, build_submitted_time={self.build_submitted_time})" ) @classmethod diff --git a/packit_service/worker/checker/distgit.py b/packit_service/worker/checker/distgit.py index def653174..3aec615d6 100644 --- a/packit_service/worker/checker/distgit.py +++ b/packit_service/worker/checker/distgit.py @@ -200,8 +200,7 @@ def pre_check(self) -> bool: valid = True msg_to_report = None issue_title = ( - "Pull from upstream could not be run for update " - f"{self.data.event_dict.get('version')}" + f"Pull from upstream could not be run for update {self.data.event_dict.get('version')}" ) if self.package_config.upstream_project_url and not ( diff --git a/packit_service/worker/checker/forges.py b/packit_service/worker/checker/forges.py index 2036f80ee..b1debc9fd 100644 --- a/packit_service/worker/checker/forges.py +++ b/packit_service/worker/checker/forges.py @@ -16,8 +16,7 @@ def pre_check(self) -> bool: """ if not (self.project.namespace == "packit" and self.project.repo == "notifications"): logger.debug( - "Packit verification comment command not placed" - "in packit/notifications repository.", + "Packit verification comment command not placedin packit/notifications repository.", ) return False diff --git a/packit_service/worker/database.py b/packit_service/worker/database.py index 740a882ef..6cabc17ff 100644 --- a/packit_service/worker/database.py +++ b/packit_service/worker/database.py @@ -33,7 +33,7 @@ def discard_old_srpm_build_logs(): ago = timedelta(days=int(outdated_after_days)) for build in SRPMBuildModel.get_older_than(ago): logger.debug( - f"SRPM build {build.id} is older than '{ago}'. " "Discarding log and artifact url.", + f"SRPM build {build.id} is older than '{ago}'. Discarding log and artifact url.", ) build.set_logs(None) build.set_url(None) diff --git a/packit_service/worker/events/comment.py b/packit_service/worker/events/comment.py index c09d00cf4..44557393b 100644 --- a/packit_service/worker/events/comment.py +++ b/packit_service/worker/events/comment.py @@ -271,8 +271,7 @@ def _add_release_trigger(self): if not release or release.git_tag.commit_sha != self.commit_sha: logger.debug( - "Release with tag name from comment doesn't exist or doesn't match " - "the commit SHA.", + "Release with tag name from comment doesn't exist or doesn't match the commit SHA.", ) return diff --git a/packit_service/worker/events/koji.py b/packit_service/worker/events/koji.py index e14fd2b7f..965dceaea 100644 --- a/packit_service/worker/events/koji.py +++ b/packit_service/worker/events/koji.py @@ -88,8 +88,7 @@ def get_koji_build_logs_url( You can redefine the Koji instance using the one defined in the service config. """ return ( - f"{koji_logs_url}//work/tasks/" - f"{rpm_build_task_id % 10000}/{rpm_build_task_id}/build.log" + f"{koji_logs_url}//work/tasks/{rpm_build_task_id % 10000}/{rpm_build_task_id}/build.log" ) def get_koji_build_rpm_tasks_logs_urls( diff --git a/packit_service/worker/events/new_hotness.py b/packit_service/worker/events/new_hotness.py index 87180d510..fa8b75756 100644 --- a/packit_service/worker/events/new_hotness.py +++ b/packit_service/worker/events/new_hotness.py @@ -111,7 +111,7 @@ def packages_config(self): return self._package_config def get_packages_config(self) -> Optional[PackageConfig]: - logger.debug(f"Getting package_config:\n" f"\tproject: {self.project}\n") + logger.debug(f"Getting package_config:\n\tproject: {self.project}\n") return PackageConfigGetter.get_package_config_from_repo( base_project=None, diff --git a/packit_service/worker/handlers/bodhi.py b/packit_service/worker/handlers/bodhi.py index c13d7f605..dc9f2bb54 100644 --- a/packit_service/worker/handlers/bodhi.py +++ b/packit_service/worker/handlers/bodhi.py @@ -298,8 +298,7 @@ def report_in_issue_repository(self, errors: dict[str, str]) -> None: packit_comment_command_prefix=self.service_config.comment_command_prefix, ) body_msg = ( - f"{body}\n{self.get_trigger_type_description()}\n\n" - f"{msg_retrigger}{MSG_GET_IN_TOUCH}\n" + f"{body}\n{self.get_trigger_type_description()}\n\n{msg_retrigger}{MSG_GET_IN_TOUCH}\n" ) body_msg = update_message_with_configured_failure_comment_message( @@ -343,7 +342,7 @@ def get_checkers() -> tuple[type[Checker], ...]: def get_trigger_type_description(self) -> str: for koji_build_data in self: - return f"Fedora Bodhi update was triggered by " f"Koji build {koji_build_data.nvr}." + return f"Fedora Bodhi update was triggered by Koji build {koji_build_data.nvr}." return "" def _get_or_create_bodhi_update_group_model(self) -> BodhiUpdateGroupModel: @@ -398,7 +397,7 @@ def get_checkers() -> tuple[type[Checker], ...]: def get_trigger_type_description(self) -> str: for koji_build_data in self: - return f"Fedora Bodhi update was triggered by " f"Koji build {koji_build_data.nvr}." + return f"Fedora Bodhi update was triggered by Koji build {koji_build_data.nvr}." return "" @@ -459,4 +458,4 @@ def get_checkers() -> tuple[type[Checker], ...]: return (HasIssueCommenterRetriggeringPermissions,) def get_trigger_type_description(self) -> str: - return f"Fedora Bodhi update was re-triggered by " f"comment in issue {self.data.issue_id}." + return f"Fedora Bodhi update was re-triggered by comment in issue {self.data.issue_id}." diff --git a/packit_service/worker/handlers/copr.py b/packit_service/worker/handlers/copr.py index 0454c84e2..d172b0f9e 100644 --- a/packit_service/worker/handlers/copr.py +++ b/packit_service/worker/handlers/copr.py @@ -175,7 +175,7 @@ def run(self): return TaskResults(success=False, details={"msg": msg}) if self.build.build_start_time is not None: - msg = f"Copr build start for {self.copr_event.build_id} is already" f" processed." + msg = f"Copr build start for {self.copr_event.build_id} is already processed." logger.debug(msg) return TaskResults(success=True, details={"msg": msg}) diff --git a/packit_service/worker/handlers/distgit.py b/packit_service/worker/handlers/distgit.py index 78b02eaf6..0b9341d32 100644 --- a/packit_service/worker/handlers/distgit.py +++ b/packit_service/worker/handlers/distgit.py @@ -458,7 +458,7 @@ def run_for_target( ) self.sync_release_helper.report_status_for_branch( branch=branch, - description=f"{self.job_name_for_reporting.capitalize()} " f"finished successfully.", + description=f"{self.job_name_for_reporting.capitalize()} finished successfully.", state=BaseCommitStatus.success, url=url, ) @@ -630,7 +630,7 @@ def _report_errors_for_each_branch(self, message: str) -> None: PackageConfigGetter.create_issue_if_needed( project=self.project, - title=f"{self.job_name_for_reporting.capitalize()} failed for " f"release {self.tag}", + title=f"{self.job_name_for_reporting.capitalize()} failed for release {self.tag}", message=body_msg, comment_to_existing=body_msg, ) @@ -715,8 +715,7 @@ def get_resolved_bugs(self) -> list[str]: def _report_errors_for_each_branch(self, message: str) -> None: body_msg = ( - f"{message}\n\n---\n\n*Get in [touch with us]({CONTACTS_URL}) if you " - f"need some help.*\n" + f"{message}\n\n---\n\n*Get in [touch with us]({CONTACTS_URL}) if you need some help.*\n" ) long_message = update_message_with_configured_failure_comment_message( body_msg, @@ -1160,7 +1159,7 @@ def get_trigger_type_description(self) -> str: ) elif self.data.event_type == PushPagureEvent.__name__: trigger_type_description += ( - f"Fedora Koji build was triggered " f"by push with sha {self.data.commit_sha}." + f"Fedora Koji build was triggered by push with sha {self.data.commit_sha}." ) elif self.data.event_type == KojiBuildTagEvent.__name__: trigger_type_description += ( @@ -1225,7 +1224,7 @@ def get_branches(self) -> list[str]: return self.branches def get_trigger_type_description(self) -> str: - return f"Fedora Koji build was re-triggered " f"by comment in issue {self.data.issue_id}." + return f"Fedora Koji build was re-triggered by comment in issue {self.data.issue_id}." @configured_as(job_type=JobType.koji_build) diff --git a/packit_service/worker/handlers/forges.py b/packit_service/worker/handlers/forges.py index a3c925a6a..892939751 100644 --- a/packit_service/worker/handlers/forges.py +++ b/packit_service/worker/handlers/forges.py @@ -191,7 +191,7 @@ def run(self) -> TaskResults: TaskResults """ logger.debug( - f"Going to run verification of FAS account triggered by comment:" f" {self.comment}", + f"Going to run verification of FAS account triggered by comment: {self.comment}", ) # e.g. User Bebaabeni needs to be approved. _, account_login, _ = self.issue.title.split(maxsplit=2) @@ -247,8 +247,7 @@ def verify(self, namespace: str, fas_account: str) -> TaskResults: sender_login=self.sender_login, ): msg = ( - f"Namespace `{namespace}` approved successfully " - f"using FAS account `{fas_account}`!" + f"Namespace `{namespace}` approved successfully using FAS account `{fas_account}`!" ) logger.debug(msg) self.issue.comment(msg) diff --git a/packit_service/worker/handlers/mixin.py b/packit_service/worker/handlers/mixin.py index 67c7ac3bd..346abb51e 100644 --- a/packit_service/worker/handlers/mixin.py +++ b/packit_service/worker/handlers/mixin.py @@ -625,7 +625,7 @@ def project_name(self) -> str: @property def image_name(self) -> str: - return f"{self.owner}/" f"{self.project_name}/{self.data.pr_id}" + return f"{self.owner}/{self.project_name}/{self.data.pr_id}" @property def image_distribution(self) -> str: diff --git a/packit_service/worker/handlers/open_scan_hub.py b/packit_service/worker/handlers/open_scan_hub.py index bfeb22657..21e479f6b 100644 --- a/packit_service/worker/handlers/open_scan_hub.py +++ b/packit_service/worker/handlers/open_scan_hub.py @@ -85,7 +85,7 @@ def check_scan_and_build(self): success=True, details={ "msg": ( - "No job configuration found for OpenScanHub task" f" in {self.project.repo}" + f"No job configuration found for OpenScanHub task in {self.project.repo}" ), }, ) diff --git a/packit_service/worker/helpers/build/babysit.py b/packit_service/worker/helpers/build/babysit.py index 0222f0b7b..af3b56792 100644 --- a/packit_service/worker/helpers/build/babysit.py +++ b/packit_service/worker/helpers/build/babysit.py @@ -507,7 +507,7 @@ def update_vm_image_build(build_id: int, build: "VMImageBuildTargetModel"): status = VMImageBuildStatus.error except Exception as ex: message = ( - f"There was an exception when getting status of the VM " f"Image Build {build_id}: {ex}" + f"There was an exception when getting status of the VM Image Build {build_id}: {ex}" ) logger.error(message) # keep polling @@ -546,8 +546,7 @@ def update_vm_image_build(build_id: int, build: "VMImageBuildTargetModel"): if not packages_config: build.set_status(status) logger.debug( - f"No package config found for {build.build_id}. " - "No feedback can be given to the user.", + f"No package config found for {build.build_id}. No feedback can be given to the user.", ) return True diff --git a/packit_service/worker/helpers/build/copr_build.py b/packit_service/worker/helpers/build/copr_build.py index 88b8d832d..21d9948e8 100644 --- a/packit_service/worker/helpers/build/copr_build.py +++ b/packit_service/worker/helpers/build/copr_build.py @@ -917,7 +917,7 @@ def create_or_update_copr_project(self) -> str: ) except PackitCoprSettingsException as ex: # notify user first, PR if exists, commit comment otherwise - table = "| field | old value | new value |\n" "| ----- | --------- | --------- |\n" + table = "| field | old value | new value |\n| ----- | --------- | --------- |\n" for field, (old, new) in ex.fields_to_change.items(): table += f"| {field} | {old} | {new} |\n" diff --git a/packit_service/worker/jobs.py b/packit_service/worker/jobs.py index 8af827f4e..f5de4d3d3 100644 --- a/packit_service/worker/jobs.py +++ b/packit_service/worker/jobs.py @@ -599,7 +599,7 @@ def create_tasks( handler_kls.get_signature(event=self.event, job=job_config), ) logger.debug( - f"Got signature for handler={handler_kls} " f"and job_config={job_config}.", + f"Got signature for handler={handler_kls} and job_config={job_config}.", ) processing_results.append( TaskResults.create_from( @@ -665,11 +665,11 @@ def is_project_public_or_enabled_private(self) -> bool: # CoprBuildEvent.get_project returns None when the build id is not known elif not self.event.project: logger.warning( - "Cannot obtain project from this event! " "Skipping private repository check!", + "Cannot obtain project from this event! Skipping private repository check!", ) elif self.event.project.is_private(): service_with_namespace = ( - f"{self.event.project.service.hostname}/" f"{self.event.project.namespace}" + f"{self.event.project.service.hostname}/{self.event.project.namespace}" ) if service_with_namespace not in self.service_config.enabled_private_namespaces: logger.info( diff --git a/packit_service/worker/monitoring.py b/packit_service/worker/monitoring.py index 9ecfa48f9..b54285432 100644 --- a/packit_service/worker/monitoring.py +++ b/packit_service/worker/monitoring.py @@ -149,8 +149,7 @@ def __init__(self): self.events_not_handled = Counter( "events_not_handled", - "The number of events resulting in a Celery task, " - "but then dropped during processing", + "The number of events resulting in a Celery task, but then dropped during processing", registry=self.registry, ) diff --git a/packit_service/worker/parser.py b/packit_service/worker/parser.py index 8255957b8..614bced77 100644 --- a/packit_service/worker/parser.py +++ b/packit_service/worker/parser.py @@ -433,10 +433,7 @@ def get_gitlab_push_common_data(event) -> tuple: ) parsed_url = parse_git_repo(potential_url=project_url) logger.info( - f"Project: " - f"repo={parsed_url.repo} " - f"namespace={parsed_url.namespace} " - f"url={project_url}.", + f"Project: repo={parsed_url.repo} namespace={parsed_url.namespace} url={project_url}.", ) ref = raw_ref.split("/", maxsplit=2)[-1] @@ -774,10 +771,7 @@ def parse_gitlab_issue_comment_event(event) -> Optional[IssueCommentGitlabEvent] return None parsed_url = parse_git_repo(potential_url=project_url) logger.info( - f"Project: " - f"repo={parsed_url.repo} " - f"namespace={parsed_url.namespace} " - f"url={project_url}.", + f"Project: repo={parsed_url.repo} namespace={parsed_url.namespace} url={project_url}.", ) actor = nested_get(event, "user", "username") @@ -901,7 +895,7 @@ def parse_gitlab_commit_comment_event( comment = nested_get(event, "object_attributes", "note") comment_id = nested_get(event, "object_attributes", "id") logger.info( - f"Gitlab commit comment on #{commit_sha}: {comment!r} id#{comment_id} " " event.", + f"Gitlab commit comment on #{commit_sha}: {comment!r} id#{comment_id} event.", ) project_url = nested_get(event, "project", "web_url") @@ -911,10 +905,7 @@ def parse_gitlab_commit_comment_event( parsed_url = parse_git_repo(potential_url=project_url) logger.info( - f"Project: " - f"repo={parsed_url.repo} " - f"namespace={parsed_url.namespace} " - f"url={project_url}.", + f"Project: repo={parsed_url.repo} namespace={parsed_url.namespace} url={project_url}.", ) actor = nested_get(event, "user", "username") diff --git a/tests/integration/test_vm_image_build.py b/tests/integration/test_vm_image_build.py index 561943373..00c42f269 100644 --- a/tests/integration/test_vm_image_build.py +++ b/tests/integration/test_vm_image_build.py @@ -103,7 +103,7 @@ def test_vm_image_build(github_vm_image_build_comment): ) flexmock(group).should_receive("apply_async").times(1) repo_download_url = ( - "https://download.copr.fedorainfracloud.org/" "results/mmassari/knx-stack/fedora-36-x86_64/" + "https://download.copr.fedorainfracloud.org/results/mmassari/knx-stack/fedora-36-x86_64/" ) flexmock(CoprHelper).should_receive("get_repo_download_url").once().and_return( repo_download_url, diff --git a/tests/unit/test_build_helper.py b/tests/unit/test_build_helper.py index d768ac123..51279a40a 100644 --- a/tests/unit/test_build_helper.py +++ b/tests/unit/test_build_helper.py @@ -1289,7 +1289,7 @@ def test_build_targets_overrides( @pytest.mark.parametrize( - "jobs,job_config_trigger_type,build_targets_override," "tests_targets_override,test_targets", + "jobs,job_config_trigger_type,build_targets_override,tests_targets_override,test_targets", [ pytest.param( [ @@ -3042,7 +3042,7 @@ def test_local_project_not_called_when_initializing_api(): "failure_comment,kwargs,result_comment", [ pytest.param( - ("One of the Copr builds failed for " "commit {commit_sha}, ping @admin"), + ("One of the Copr builds failed for commit {commit_sha}, ping @admin"), {}, "One of the Copr builds failed for commit 123, ping @admin", id="only commit_sha", diff --git a/tests/unit/test_handler_vm_image.py b/tests/unit/test_handler_vm_image.py index 9fad1defd..1e304d57d 100644 --- a/tests/unit/test_handler_vm_image.py +++ b/tests/unit/test_handler_vm_image.py @@ -137,7 +137,7 @@ def test_vm_image_build_handler(fake_package_config_job_config_project_db_trigge handler._packit_api = flexmock(copr_helper=flexmock()) repo_download_url = ( - "https://download.copr.fedorainfracloud.org/" "results/mmassari/knx-stack/fedora-36-x86_64/" + "https://download.copr.fedorainfracloud.org/results/mmassari/knx-stack/fedora-36-x86_64/" ) handler.packit_api.copr_helper.should_receive("get_repo_download_url").with_args( owner="mmassari", diff --git a/tests/unit/test_jobs.py b/tests/unit/test_jobs.py index bc52fdbd6..4db29058c 100644 --- a/tests/unit/test_jobs.py +++ b/tests/unit/test_jobs.py @@ -533,7 +533,7 @@ ), ], {TestingFarmHandler}, - id="config=test_for_pr_skip_build" "&pull_request&PullRequestGithubEvent", + id="config=test_for_pr_skip_build&pull_request&PullRequestGithubEvent", ), pytest.param( PullRequestGithubEvent, @@ -749,7 +749,7 @@ ), ], {CoprBuildHandler}, - id="config=test_for_pr+build_for_commit+build_for_release" "&commit&PushGitHubEvent", + id="config=test_for_pr+build_for_commit+build_for_release&commit&PushGitHubEvent", ), pytest.param( TestingFarmResultsEvent, @@ -816,8 +816,7 @@ ), ], {CoprBuildHandler, KojiBuildHandler}, - id="config=build_for_pr+upstream_koji_build_for_pr" - "&pull_request&PullRequestGithubEvent", + id="config=build_for_pr+upstream_koji_build_for_pr&pull_request&PullRequestGithubEvent", ), pytest.param( CoprBuildStartEvent, @@ -835,7 +834,7 @@ ), ], {CoprBuildStartHandler}, - id="config=build_for_pr+upstream_koji_build_for_pr" "&pull_request&CoprBuildStartEvent", + id="config=build_for_pr+upstream_koji_build_for_pr&pull_request&CoprBuildStartEvent", ), pytest.param( KojiTaskEvent, @@ -853,7 +852,7 @@ ), ], {KojiTaskReportHandler}, - id="config=build_for_pr+upstream_koji_build_for_pr" "&pull_request&KojiBuildEvent", + id="config=build_for_pr+upstream_koji_build_for_pr&pull_request&KojiBuildEvent", ), pytest.param( PushPagureEvent, @@ -979,7 +978,7 @@ def packages_config(self): ), ], set(), - id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent" "&empty_comment", + id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent&empty_comment", ), pytest.param( PullRequestCommentGithubEvent, @@ -994,8 +993,7 @@ def packages_config(self): ), ], set(), - id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent" - "&empty_comment&stg", + id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent&empty_comment&stg", ), pytest.param( PullRequestCommentGithubEvent, @@ -1010,7 +1008,7 @@ def packages_config(self): ), ], {CoprBuildHandler}, - id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent" "&packit_build", + id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent&packit_build", ), pytest.param( PullRequestCommentGithubEvent, @@ -1025,8 +1023,7 @@ def packages_config(self): ), ], {CoprBuildHandler}, - id="config=copr_build_for_pr&pull_request&PullRequestCommentGithubEvent" - "&packit_build", + id="config=copr_build_for_pr&pull_request&PullRequestCommentGithubEvent&packit_build", ), pytest.param( PullRequestCommentGithubEvent, @@ -1041,8 +1038,7 @@ def packages_config(self): ), ], {CoprBuildHandler}, - id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent" - "&packit_copr-build", + id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent&packit_copr-build", ), pytest.param( PullRequestCommentGithubEvent, @@ -1057,7 +1053,7 @@ def packages_config(self): ), ], {TestingFarmHandler}, - id="config=test_for_pr&pull_request&PullRequestCommentGithubEvent" "&packit_build", + id="config=test_for_pr&pull_request&PullRequestCommentGithubEvent&packit_build", ), pytest.param( PullRequestCommentGithubEvent, @@ -1072,7 +1068,7 @@ def packages_config(self): ), ], {TestingFarmHandler}, - id="config=test_for_pr&pull_request&PullRequestCommentGithubEvent" "&packit_test", + id="config=test_for_pr&pull_request&PullRequestCommentGithubEvent&packit_test", ), pytest.param( PullRequestCommentGithubEvent, @@ -1143,7 +1139,7 @@ def packages_config(self): ), ], set(), - id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent" "&packit_build&stg", + id="config=build_for_pr&pull_request&PullRequestCommentGithubEvent&packit_build&stg", ), pytest.param( PullRequestCommentGithubEvent, @@ -1237,7 +1233,7 @@ def packages_config(self): ), ], {CoprBuildHandler}, - id="config=build_for_pr&pull_request&CheckRerunPullRequestEvent" "&identifier_match", + id="config=build_for_pr&pull_request&CheckRerunPullRequestEvent&identifier_match", ), pytest.param( CheckRerunPullRequestEvent, @@ -1670,8 +1666,7 @@ def packages_config(self): }, ), ], - id="build_for_pr+build_for_commit+build_for_release" - "&CoprBuildHandler&PushGitHubEvent", + id="build_for_pr+build_for_commit+build_for_release&CoprBuildHandler&PushGitHubEvent", ), pytest.param( CoprBuildHandler, @@ -1717,7 +1712,7 @@ def packages_config(self): }, ), ], - id="build_for_pr+build_for_commit+build_for_release" "&CoprBuildHandler&ReleaseEvent", + id="build_for_pr+build_for_commit+build_for_release&CoprBuildHandler&ReleaseEvent", ), # Build for commit and release, test for pr pytest.param( @@ -1801,8 +1796,7 @@ def packages_config(self): }, ), ], - id="tests_for_pr+build_for_commit+build_for_release" - "&CoprBuildHandler&PushGitHubEvent", + id="tests_for_pr+build_for_commit+build_for_release&CoprBuildHandler&PushGitHubEvent", ), pytest.param( CoprBuildHandler, @@ -1848,7 +1842,7 @@ def packages_config(self): }, ), ], - id="tests_for_pr+build_for_commit+build_for_release" "&CoprBuildHandler&ReleaseEvent", + id="tests_for_pr+build_for_commit+build_for_release&CoprBuildHandler&ReleaseEvent", ), pytest.param( TestingFarmResultsHandler, @@ -3665,6 +3659,6 @@ def test_unapproved_jobs(): results = jobs.process_jobs() assert results and len(results) == 3, "we have gotten exactly 3 results" - assert all( - not result["success"] for result in results - ), "all of them must've failed the permission check" + assert all(not result["success"] for result in results), ( + "all of them must've failed the permission check" + ) diff --git a/tests/unit/test_open_scan_hub.py b/tests/unit/test_open_scan_hub.py index 8c757e750..ce6b983a4 100644 --- a/tests/unit/test_open_scan_hub.py +++ b/tests/unit/test_open_scan_hub.py @@ -269,7 +269,7 @@ def test_handle_scan_task_finished( } if scan_status == OpenScanHubTaskFinishedEvent.Status.success: state = BaseCommitStatus.success - description = "Scan in OpenScanHub is finished. " "2 new findings identified." + description = "Scan in OpenScanHub is finished. 2 new findings identified." flexmock(scan_mock).should_receive("set_status").with_args( "succeeded", ).once() diff --git a/tests/unit/test_reporting.py b/tests/unit/test_reporting.py index 2248040b5..ae40fed5f 100644 --- a/tests/unit/test_reporting.py +++ b/tests/unit/test_reporting.py @@ -35,12 +35,7 @@ @pytest.mark.parametrize( - ( - "project,commit_sha," - "pr_id,pr_object," - "state,description,check_name,url,state_to_set," - "uid" - ), + ("project,commit_sha,pr_id,pr_object,state,description,check_name,url,state_to_set,uid"), [ pytest.param( flexmock(), @@ -109,7 +104,7 @@ def test_set_status_pagure( @pytest.mark.parametrize( - ("commit_sha,pr_id,pr_object," "state,description,check_name,url,state_to_set"), + ("commit_sha,pr_id,pr_object,state,description,check_name,url,state_to_set"), [ pytest.param( "7654321", diff --git a/tests/unit/test_testing_farm.py b/tests/unit/test_testing_farm.py index 3b95e8c12..6aced4007 100644 --- a/tests/unit/test_testing_farm.py +++ b/tests/unit/test_testing_farm.py @@ -272,7 +272,7 @@ def test_distro2compose(target, compose, use_internal_tf): @pytest.mark.parametrize( - ("build_id," "chroot," "built_packages," "packages_to_send"), + ("build_id,chroot,built_packages,packages_to_send"), [ ( "123456", @@ -1721,7 +1721,7 @@ def test_get_additional_builds_wrong_format(): @pytest.mark.parametrize( - ("chroot," "build," "additional_build," "result"), + ("chroot,build,additional_build,result"), [ ( "centos-stream-x86_64", diff --git a/tests_openshift/conftest.py b/tests_openshift/conftest.py index 87f5348dd..07f04ea30 100644 --- a/tests_openshift/conftest.py +++ b/tests_openshift/conftest.py @@ -1496,7 +1496,7 @@ def release_event_dict(): return { "action": "published", "release": { - "html_url": "https://github.com/the-namespace/the-repo-name/" "releases/tag/v1.0.2", + "html_url": "https://github.com/the-namespace/the-repo-name/releases/tag/v1.0.2", "tag_name": "v1.0.2", "target_commitish": "master", "name": "test", diff --git a/tests_openshift/database/test_tasks.py b/tests_openshift/database/test_tasks.py index 306abee07..9235c6277 100644 --- a/tests_openshift/database/test_tasks.py +++ b/tests_openshift/database/test_tasks.py @@ -75,7 +75,7 @@ def packit_build_752(): project_name="packit-service-packit-752", owner="packit", web_url=( - "https://download.copr.fedorainfracloud.org/" "results/packit/packit-service-packit-752" + "https://download.copr.fedorainfracloud.org/results/packit/packit-service-packit-752" ), target="fedora-rawhide-x86_64", status=BuildStatus.pending,