Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Nov 26, 2024
1 parent 0c0e01b commit 4686a82
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion packit_service/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

from cachetools import TTLCache, cached
from cachetools.func import ttl_cache
from packit.config import JobConfigTriggerType
from sqlalchemy import (
JSON,
Boolean,
Expand Down Expand Up @@ -54,7 +55,6 @@
from sqlalchemy.sql.functions import count
from sqlalchemy.types import ARRAY

from packit.config import JobConfigTriggerType
from packit_service.constants import ALLOWLIST_CONSTANTS

logger = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion packit_service/worker/events/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

from ogr.abstract import GitProject, PullRequest
from ogr.parsing import RepoUrl

from packit.config import JobConfigTriggerType, PackageConfig

from packit_service.config import PackageConfigGetter, ServiceConfig
from packit_service.models import (
AbstractProjectObjectDbType,
Expand Down
1 change: 1 addition & 0 deletions packit_service/worker/handlers/mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from packit.exceptions import PackitException
from packit.utils.koji_helper import KojiHelper
from packit.vm_image_build import ImageBuilder

from packit_service.config import ProjectToSync
from packit_service.constants import COPR_SRPM_CHROOT, KojiBuildState
from packit_service.models import (
Expand Down
4 changes: 2 additions & 2 deletions packit_service/worker/helpers/build/build_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

from kubernetes.client.rest import ApiException
from ogr.abstract import GitProject
from sandcastle import SandcastleTimeoutReached

from packit.config import JobConfig, JobConfigTriggerType, JobType
from packit.config.aliases import DEFAULT_VERSION
from packit.config.package_config import PackageConfig
from packit.exceptions import PackitMergeException
from packit.utils import PackitFormatter
from sandcastle import SandcastleTimeoutReached

from packit_service import sentry_integration
from packit_service.config import ServiceConfig
from packit_service.constants import FAILURE_COMMENT_MESSAGE_VARIABLES
Expand Down
2 changes: 1 addition & 1 deletion packit_service/worker/helpers/build/copr_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from ogr.parsing import parse_git_repo
from ogr.services.github import GithubProject
from ogr.services.gitlab import GitlabProject

from packit.config import JobConfig, JobConfigTriggerType, JobType
from packit.config.aliases import get_aliases
from packit.config.common_package_config import Deployment, MockBootstrapSetup
Expand All @@ -25,6 +24,7 @@
PackitCoprSettingsException,
)
from packit.utils.source_script import create_source_script

from packit_service import sentry_integration
from packit_service.celerizer import celery_app
from packit_service.config import ServiceConfig
Expand Down
2 changes: 1 addition & 1 deletion packit_service/worker/helpers/build/koji_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
from typing import Optional

from ogr.abstract import GitProject

from packit.config import JobConfig, JobType
from packit.config.aliases import get_all_koji_targets, get_koji_targets
from packit.config.package_config import PackageConfig
from packit.exceptions import PackitCommandFailedError

from packit_service import sentry_integration
from packit_service.config import ServiceConfig
from packit_service.constants import MSG_RETRIGGER
Expand Down
2 changes: 1 addition & 1 deletion packit_service/worker/helpers/testing_farm.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
import requests
from ogr.abstract import GitProject
from ogr.utils import RequestResponse

from packit.config import JobConfig, PackageConfig
from packit.constants import HTTP_REQUEST_TIMEOUT
from packit.exceptions import PackitConfigException, PackitException
from packit.utils import nested_get

from packit_service.config import ServiceConfig
from packit_service.constants import (
BASE_RETRY_INTERVAL_IN_MINUTES_FOR_OUTAGES,
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_check_rerun.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
from flexmock import flexmock
from github.MainClass import Github
from ogr.services.github import GithubProject

from packit.config import JobConfigTriggerType
from packit.copr_helper import CoprHelper
from packit.local_project import LocalProject

from packit_service.constants import (
TASK_ACCEPTED,
)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_listen_to_fedmsg.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
from flexmock import flexmock
from ogr.services.github import GithubProject
from ogr.utils import RequestResponse

import packit_service.service.urls as urls
from packit.config import (
CommonPackageConfig,
JobConfig,
Expand All @@ -26,6 +24,8 @@
from packit.copr_helper import CoprHelper
from packit.local_project import LocalProject
from packit.utils.koji_helper import KojiHelper

import packit_service.service.urls as urls
from packit_service.config import PackageConfigGetter, ServiceConfig
from packit_service.constants import COPR_API_FAIL_STATE, DEFAULT_RETRY_LIMIT
from packit_service.models import (
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/test_pr_comment.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
from ogr.services.github import GithubProject, GithubService
from ogr.services.pagure import PagureProject
from ogr.utils import RequestResponse

import packit_service.models
import packit_service.service.urls as urls
from packit.api import PackitAPI
from packit.config import (
JobConfigTriggerType,
Expand All @@ -25,6 +22,9 @@
from packit.local_project import LocalProject, LocalProjectBuilder
from packit.upstream import GitUpstream
from packit.utils.koji_helper import KojiHelper

import packit_service.models
import packit_service.service.urls as urls
from packit_service.config import ServiceConfig
from packit_service.constants import (
COMMENT_REACTION,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/events/test_github.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from flexmock import flexmock
from ogr import GithubService
from ogr.services.github import GithubProject

from packit.config import JobConfigTriggerType

from packit_service.config import PackageConfigGetter
from packit_service.models import (
AllowlistStatus,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_build_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import pytest
from flexmock import flexmock

from packit.config import (
CommonPackageConfig,
JobConfig,
Expand All @@ -19,6 +18,7 @@
from packit.copr_helper import CoprHelper
from packit.local_project import LocalProject
from packit.utils.repo import RepositoryCache

from packit_service.config import ServiceConfig
from packit_service.models import ProjectEventModelType
from packit_service.worker.helpers.build.copr_build import CoprBuildJobHelper
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_koji_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import pytest
from flexmock import flexmock
from ogr.abstract import GitProject

from packit.api import PackitAPI
from packit.config import (
CommonPackageConfig,
Expand All @@ -17,6 +16,7 @@
)
from packit.exceptions import PackitCommandFailedError
from packit.upstream import GitUpstream

from packit_service import sentry_integration
from packit_service.config import ServiceConfig
from packit_service.models import (
Expand Down

0 comments on commit 4686a82

Please sign in to comment.