From 3afddcea5dc10aa32d9bb29af6bca6c9e91dbdb9 Mon Sep 17 00:00:00 2001 From: Markus Hofbauer Date: Thu, 1 Feb 2024 20:31:03 +0100 Subject: [PATCH] fix ruff isort --- .pre-commit-config.yaml | 9 ++------- tools/sel_tools/code_evaluation/evaluate_code.py | 3 ++- tools/sel_tools/diff_creation/create_diff.py | 3 ++- tools/sel_tools/gitlab_api/attachments.py | 1 + tools/sel_tools/gitlab_api/comment_issue.py | 3 ++- tools/sel_tools/gitlab_api/create_commit.py | 3 ++- tools/sel_tools/gitlab_api/create_issue.py | 3 ++- tools/sel_tools/gitlab_api/create_repo.py | 3 ++- tools/sel_tools/gitlab_api/fetch_repo.py | 3 ++- tools/sel_tools/utils/repo.py | 1 + tools/tests/code_evaluation/jobs/test_common.py | 1 + tools/tests/code_evaluation/jobs/test_factory.py | 1 + tools/tests/code_evaluation/test_evaluate_code.py | 1 + tools/tests/code_evaluation/test_report.py | 1 + tools/tests/diff_creation/test_create_diff.py | 1 + tools/tests/gitlab_api/test_create_repo.py | 1 + tools/tests/utils/test_repo.py | 1 + 17 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fa21e56..b25a3ed 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,11 +77,6 @@ repos: rev: v0.23.1 hooks: - id: toml-sort-fix - - repo: https://github.com/psf/black - rev: 23.12.1 - hooks: - - id: black - language_version: python3 - repo: https://github.com/PyCQA/docformatter rev: v1.7.5 hooks: @@ -104,7 +99,7 @@ repos: additional_dependencies: [cmakelang] exclude: cmake/.* - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.1.14 + rev: v0.1.15 hooks: - id: ruff - id: ruff-format @@ -135,7 +130,7 @@ repos: hooks: - id: shellcheck - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.27.3 + rev: 0.27.4 hooks: - id: check-github-workflows - repo: https://github.com/crate-ci/typos diff --git a/tools/sel_tools/code_evaluation/evaluate_code.py b/tools/sel_tools/code_evaluation/evaluate_code.py index bc20215..e61769a 100644 --- a/tools/sel_tools/code_evaluation/evaluate_code.py +++ b/tools/sel_tools/code_evaluation/evaluate_code.py @@ -5,11 +5,12 @@ from datetime import date import git +from tqdm import tqdm + from sel_tools.code_evaluation.jobs.common import EvaluationJob from sel_tools.code_evaluation.jobs.factory import EvaluationJobFactory from sel_tools.code_evaluation.report import EvaluationReport from sel_tools.utils.repo import GitlabProject -from tqdm import tqdm def evaluate_code( diff --git a/tools/sel_tools/diff_creation/create_diff.py b/tools/sel_tools/diff_creation/create_diff.py index 5d9b0ef..30f673f 100644 --- a/tools/sel_tools/diff_creation/create_diff.py +++ b/tools/sel_tools/diff_creation/create_diff.py @@ -5,9 +5,10 @@ import git from git.objects.commit import Commit -from sel_tools.diff_creation.report import Diff, DiffReport from tqdm import tqdm +from sel_tools.diff_creation.report import Diff, DiffReport + def create_diff( repo_paths: list[Path], diff --git a/tools/sel_tools/gitlab_api/attachments.py b/tools/sel_tools/gitlab_api/attachments.py index 3b88ff1..92ed273 100644 --- a/tools/sel_tools/gitlab_api/attachments.py +++ b/tools/sel_tools/gitlab_api/attachments.py @@ -3,6 +3,7 @@ from pathlib import Path from gitlab.v4.objects.projects import Project + from sel_tools.config import REPO_DIR diff --git a/tools/sel_tools/gitlab_api/comment_issue.py b/tools/sel_tools/gitlab_api/comment_issue.py index aa4ffcd..f71f8db 100644 --- a/tools/sel_tools/gitlab_api/comment_issue.py +++ b/tools/sel_tools/gitlab_api/comment_issue.py @@ -6,13 +6,14 @@ import gitlab from gitlab.v4.objects.projects import Project +from tqdm import tqdm + from sel_tools.config import GITLAB_SERVER_URL from sel_tools.gitlab_api.attachments import ( replace_file_paths_with_urls, upload_attachments, ) from sel_tools.utils.comment import Comment -from tqdm import tqdm def comment_issues( diff --git a/tools/sel_tools/gitlab_api/create_commit.py b/tools/sel_tools/gitlab_api/create_commit.py index 5b5150b..8a44980 100644 --- a/tools/sel_tools/gitlab_api/create_commit.py +++ b/tools/sel_tools/gitlab_api/create_commit.py @@ -7,9 +7,10 @@ import git import gitlab from gitlab.v4.objects.projects import Project +from tqdm import tqdm + from sel_tools.config import GIT_MAIN_BRANCH, GITLAB_SERVER_URL from sel_tools.utils.files import FileTree, FileVisitor -from tqdm import tqdm def commit_changes(repo_paths: list[Path], message: str) -> None: diff --git a/tools/sel_tools/gitlab_api/create_issue.py b/tools/sel_tools/gitlab_api/create_issue.py index 324cd1d..43a5489 100644 --- a/tools/sel_tools/gitlab_api/create_issue.py +++ b/tools/sel_tools/gitlab_api/create_issue.py @@ -6,13 +6,14 @@ import gitlab from gitlab.v4.objects.projects import Project +from tqdm import tqdm + from sel_tools.config import GITLAB_SERVER_URL from sel_tools.gitlab_api.attachments import ( replace_file_paths_with_urls, upload_attachments, ) from sel_tools.utils.task import Task -from tqdm import tqdm def create_issues( diff --git a/tools/sel_tools/gitlab_api/create_repo.py b/tools/sel_tools/gitlab_api/create_repo.py index 00d7710..7711d2e 100644 --- a/tools/sel_tools/gitlab_api/create_repo.py +++ b/tools/sel_tools/gitlab_api/create_repo.py @@ -5,9 +5,10 @@ import gitlab from gitlab.v4.objects.projects import Project +from tqdm import tqdm + from sel_tools.config import AVATAR_PATH, GIT_MAIN_BRANCH, GITLAB_SERVER_URL, RUNNER_ID from sel_tools.gitlab_api.create_commit import create_commit -from tqdm import tqdm def create_repos( diff --git a/tools/sel_tools/gitlab_api/fetch_repo.py b/tools/sel_tools/gitlab_api/fetch_repo.py index 3361bd4..6a0b4aa 100644 --- a/tools/sel_tools/gitlab_api/fetch_repo.py +++ b/tools/sel_tools/gitlab_api/fetch_repo.py @@ -6,9 +6,10 @@ import gitlab from gitlab.v4.objects.projects import Project +from tqdm import tqdm + from sel_tools.config import GIT_MAIN_BRANCH, GITLAB_SERVER_URL from sel_tools.utils.repo import GitlabProject, GitRepo -from tqdm import tqdm def fetch_repos( diff --git a/tools/sel_tools/utils/repo.py b/tools/sel_tools/utils/repo.py index 19d26bf..cf0ee56 100644 --- a/tools/sel_tools/utils/repo.py +++ b/tools/sel_tools/utils/repo.py @@ -6,6 +6,7 @@ import git from gitlab.v4.objects.projects import Project + from sel_tools.config import GIT_MAIN_BRANCH diff --git a/tools/tests/code_evaluation/jobs/test_common.py b/tools/tests/code_evaluation/jobs/test_common.py index 2d7b11c..80608bf 100644 --- a/tools/tests/code_evaluation/jobs/test_common.py +++ b/tools/tests/code_evaluation/jobs/test_common.py @@ -11,6 +11,7 @@ run_shell_command_with_output, ) from sel_tools.code_evaluation.report import EvaluationResult + from tests.helper import ComplexJob, SimpleFailingJob, SimplePassingJob diff --git a/tools/tests/code_evaluation/jobs/test_factory.py b/tools/tests/code_evaluation/jobs/test_factory.py index e7805b9..9acba43 100644 --- a/tools/tests/code_evaluation/jobs/test_factory.py +++ b/tools/tests/code_evaluation/jobs/test_factory.py @@ -4,6 +4,7 @@ from pathlib import Path from sel_tools.code_evaluation.jobs.factory import EvaluationJobFactory + from tests.helper import SimplePassingJob diff --git a/tools/tests/code_evaluation/test_evaluate_code.py b/tools/tests/code_evaluation/test_evaluate_code.py index 74179c6..fd80914 100644 --- a/tools/tests/code_evaluation/test_evaluate_code.py +++ b/tools/tests/code_evaluation/test_evaluate_code.py @@ -4,6 +4,7 @@ from sel_tools.code_evaluation.evaluate_code import CodeEvaluator from sel_tools.utils.repo import GitlabProject + from tests.helper import ComplexJob, GitlabProjectFake, GitTestCase, SimplePassingJob diff --git a/tools/tests/code_evaluation/test_report.py b/tools/tests/code_evaluation/test_report.py index 62b7788..d989445 100644 --- a/tools/tests/code_evaluation/test_report.py +++ b/tools/tests/code_evaluation/test_report.py @@ -11,6 +11,7 @@ write_evaluation_reports, ) from sel_tools.utils.repo import GitlabProject + from tests.helper import GitlabProjectFake diff --git a/tools/tests/diff_creation/test_create_diff.py b/tools/tests/diff_creation/test_create_diff.py index 6349322..5644033 100644 --- a/tools/tests/diff_creation/test_create_diff.py +++ b/tools/tests/diff_creation/test_create_diff.py @@ -5,6 +5,7 @@ from pathlib import Path from sel_tools.diff_creation.create_diff import DiffCreator, create_diff + from tests.helper import GitTestCase diff --git a/tools/tests/gitlab_api/test_create_repo.py b/tools/tests/gitlab_api/test_create_repo.py index bfea351..4210f00 100644 --- a/tools/tests/gitlab_api/test_create_repo.py +++ b/tools/tests/gitlab_api/test_create_repo.py @@ -11,6 +11,7 @@ get_repo_settings, store_student_repo_info_to_config_file, ) + from tests.helper import GitlabGroupFake diff --git a/tools/tests/utils/test_repo.py b/tools/tests/utils/test_repo.py index b38b2ce..0ded9b9 100644 --- a/tools/tests/utils/test_repo.py +++ b/tools/tests/utils/test_repo.py @@ -6,6 +6,7 @@ from sel_tools.config import GIT_MAIN_BRANCH from sel_tools.utils.repo import GitRepo + from tests.helper import GitTestCase