diff --git a/dev_tools/check_forbidden_tags.py b/dev_tools/check_forbidden_tags.py index cd48627..8da14fa 100644 --- a/dev_tools/check_forbidden_tags.py +++ b/dev_tools/check_forbidden_tags.py @@ -4,8 +4,8 @@ import sys from typing import TYPE_CHECKING -from dev_tools.build_file_parsing_util import find_rule_calls, rule_has_tag -from dev_tools.git_hook_utils import create_default_parser +from dev_tools.utils.build_file_parsing_utils import find_rule_calls, rule_has_tag +from dev_tools.utils.git_hook_utils import create_default_parser if TYPE_CHECKING: import argparse diff --git a/dev_tools/check_jira_reference_in_todo.py b/dev_tools/check_jira_reference_in_todo.py index 9c85d16..d64380a 100644 --- a/dev_tools/check_jira_reference_in_todo.py +++ b/dev_tools/check_jira_reference_in_todo.py @@ -7,7 +7,7 @@ import sys from typing import TYPE_CHECKING -from dev_tools.git_hook_utils import parse_arguments +from dev_tools.utils.git_hook_utils import parse_arguments if TYPE_CHECKING: from collections.abc import Sequence diff --git a/dev_tools/check_load_statement.py b/dev_tools/check_load_statement.py index 0626d85..394ea20 100644 --- a/dev_tools/check_load_statement.py +++ b/dev_tools/check_load_statement.py @@ -4,7 +4,7 @@ import sys from typing import TYPE_CHECKING -from dev_tools.git_hook_utils import create_default_parser +from dev_tools.utils.git_hook_utils import create_default_parser if TYPE_CHECKING: import argparse diff --git a/dev_tools/check_max_one_sentence_per_line.py b/dev_tools/check_max_one_sentence_per_line.py index aba58a6..deea3de 100644 --- a/dev_tools/check_max_one_sentence_per_line.py +++ b/dev_tools/check_max_one_sentence_per_line.py @@ -5,7 +5,7 @@ import regex -from dev_tools.git_hook_utils import parse_arguments +from dev_tools.utils.git_hook_utils import parse_arguments if TYPE_CHECKING: from collections.abc import Callable, Sequence diff --git a/dev_tools/check_number_of_lines_count.py b/dev_tools/check_number_of_lines_count.py index a6bcae2..7882f64 100644 --- a/dev_tools/check_number_of_lines_count.py +++ b/dev_tools/check_number_of_lines_count.py @@ -6,7 +6,7 @@ import sys from typing import TYPE_CHECKING -from dev_tools.git_hook_utils import create_default_parser +from dev_tools.utils.git_hook_utils import create_default_parser if TYPE_CHECKING: import argparse diff --git a/dev_tools/check_ownership.py b/dev_tools/check_ownership.py index e26676b..cf39dbc 100644 --- a/dev_tools/check_ownership.py +++ b/dev_tools/check_ownership.py @@ -16,7 +16,7 @@ get_ownership_entries, ) -from dev_tools.git_hook_utils import create_default_parser +from dev_tools.utils.git_hook_utils import create_default_parser if TYPE_CHECKING: from argparse import Namespace diff --git a/dev_tools/check_rule_has_tag.py b/dev_tools/check_rule_has_tag.py index d9c8da2..879f051 100644 --- a/dev_tools/check_rule_has_tag.py +++ b/dev_tools/check_rule_has_tag.py @@ -3,8 +3,8 @@ import sys from typing import TYPE_CHECKING -from dev_tools.build_file_parsing_util import find_rule_calls, rule_has_tag -from dev_tools.git_hook_utils import create_default_parser +from dev_tools.utils.build_file_parsing_utils import find_rule_calls, rule_has_tag +from dev_tools.utils.git_hook_utils import create_default_parser if TYPE_CHECKING: import argparse diff --git a/dev_tools/check_shellscript_set_options.py b/dev_tools/check_shellscript_set_options.py index f319446..dcba63a 100644 --- a/dev_tools/check_shellscript_set_options.py +++ b/dev_tools/check_shellscript_set_options.py @@ -9,7 +9,7 @@ import sys from typing import TYPE_CHECKING -from dev_tools.git_hook_utils import parse_arguments +from dev_tools.utils.git_hook_utils import parse_arguments if TYPE_CHECKING: from collections.abc import Sequence diff --git a/dev_tools/sync_tool_versions.py b/dev_tools/sync_tool_versions.py index 7964f49..48f044f 100644 --- a/dev_tools/sync_tool_versions.py +++ b/dev_tools/sync_tool_versions.py @@ -9,7 +9,7 @@ from ruamel.yaml import YAML -from dev_tools.git_hook_utils import create_default_parser +from dev_tools.utils.git_hook_utils import create_default_parser if TYPE_CHECKING: import argparse diff --git a/dev_tools/utils/__init__.py b/dev_tools/utils/__init__.py new file mode 100644 index 0000000..f5d3dc7 --- /dev/null +++ b/dev_tools/utils/__init__.py @@ -0,0 +1 @@ +"""Utility functions.""" diff --git a/dev_tools/build_file_parsing_util.py b/dev_tools/utils/build_file_parsing_utils.py similarity index 100% rename from dev_tools/build_file_parsing_util.py rename to dev_tools/utils/build_file_parsing_utils.py diff --git a/dev_tools/git_hook_utils.py b/dev_tools/utils/git_hook_utils.py similarity index 100% rename from dev_tools/git_hook_utils.py rename to dev_tools/utils/git_hook_utils.py diff --git a/dev_tools/pre_commit_utils.py b/dev_tools/utils/pre_commit_utils.py similarity index 100% rename from dev_tools/pre_commit_utils.py rename to dev_tools/utils/pre_commit_utils.py diff --git a/tests/configure_vscode_for_bazel/__init__.py b/tests/configure_vscode_for_bazel/__init__.py new file mode 100644 index 0000000..867767b --- /dev/null +++ b/tests/configure_vscode_for_bazel/__init__.py @@ -0,0 +1 @@ +"""Tests for packages/configure_vscode_for_bazel.""" diff --git a/tests/test_configure_vscode_for_bazel.py b/tests/configure_vscode_for_bazel/test_configure_vscode_for_bazel.py similarity index 100% rename from tests/test_configure_vscode_for_bazel.py rename to tests/configure_vscode_for_bazel/test_configure_vscode_for_bazel.py diff --git a/tests/test_check_build_file_extensions.py b/tests/test_check_build_file_extensions.py index af76dbd..334533d 100644 --- a/tests/test_check_build_file_extensions.py +++ b/tests/test_check_build_file_extensions.py @@ -2,7 +2,7 @@ import pytest -from dev_tools.pre_commit_utils import get_hook_by_id +from dev_tools.utils.pre_commit_utils import get_hook_by_id @pytest.fixture diff --git a/tests/test_check_cpp_tests_pattern.py b/tests/test_check_cpp_tests_pattern.py index 87340ad..17e5122 100644 --- a/tests/test_check_cpp_tests_pattern.py +++ b/tests/test_check_cpp_tests_pattern.py @@ -2,7 +2,7 @@ import pytest -from dev_tools.pre_commit_utils import get_hook_by_id +from dev_tools.utils.pre_commit_utils import get_hook_by_id @pytest.fixture diff --git a/tests/test_check_readme_md_consistency.py b/tests/test_check_readme_md_consistency.py index 85386eb..dfdb898 100644 --- a/tests/test_check_readme_md_consistency.py +++ b/tests/test_check_readme_md_consistency.py @@ -2,7 +2,7 @@ import pytest -from dev_tools.pre_commit_utils import get_hook_by_id +from dev_tools.utils.pre_commit_utils import get_hook_by_id @pytest.fixture diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py new file mode 100644 index 0000000..60f3b47 --- /dev/null +++ b/tests/utils/__init__.py @@ -0,0 +1 @@ +"""Tests for utils.""" diff --git a/tests/test_build_file_parsing_util.py b/tests/utils/test_build_file_parsing_utils.py similarity index 96% rename from tests/test_build_file_parsing_util.py rename to tests/utils/test_build_file_parsing_utils.py index 0d5f0e2..9ea96db 100644 --- a/tests/test_build_file_parsing_util.py +++ b/tests/utils/test_build_file_parsing_utils.py @@ -2,7 +2,7 @@ import pytest -from dev_tools.build_file_parsing_util import find_rule_calls, rule_has_tag +from dev_tools.utils.build_file_parsing_utils import find_rule_calls, rule_has_tag @pytest.mark.parametrize( diff --git a/tests/whoowns/__init__.py b/tests/whoowns/__init__.py new file mode 100644 index 0000000..ff76001 --- /dev/null +++ b/tests/whoowns/__init__.py @@ -0,0 +1 @@ +"""Tests for packages/whoowns.""" diff --git a/tests/test_find_owner.py b/tests/whoowns/test_find_owner.py similarity index 100% rename from tests/test_find_owner.py rename to tests/whoowns/test_find_owner.py diff --git a/tests/test_ownership_utils.py b/tests/whoowns/test_ownership_utils.py similarity index 100% rename from tests/test_ownership_utils.py rename to tests/whoowns/test_ownership_utils.py