diff --git a/chasten/checks.py b/chasten/checks.py index 6e1d2b54..c732f6c0 100644 --- a/chasten/checks.py +++ b/chasten/checks.py @@ -1,8 +1,13 @@ """Extract and analyze details about specific checks.""" -from typing import Dict, List, Tuple, Union - -from chasten import constants, enumerations, util +from typing import Dict +from typing import List +from typing import Tuple +from typing import Union + +from chasten import constants +from chasten import enumerations +from chasten import util def extract_min_max( diff --git a/chasten/database.py b/chasten/database.py index 401333ad..1c618389 100644 --- a/chasten/database.py +++ b/chasten/database.py @@ -6,7 +6,10 @@ from sqlite_utils import Database -from chasten import constants, enumerations, filesystem, output +from chasten import constants +from chasten import enumerations +from chasten import filesystem +from chasten import output CHASTEN_SQL_SELECT_QUERY = """ SELECT diff --git a/chasten/filesystem.py b/chasten/filesystem.py index 5d12e249..368d94a2 100644 --- a/chasten/filesystem.py +++ b/chasten/filesystem.py @@ -5,12 +5,21 @@ import uuid from datetime import datetime from pathlib import Path -from typing import Any, Dict, List, NoReturn, Optional, Tuple, Union +from typing import Any +from typing import Dict +from typing import List +from typing import NoReturn +from typing import Optional +from typing import Tuple +from typing import Union import flatterer # type: ignore from rich.tree import Tree -from chasten import configuration, constants, database, results +from chasten import configuration +from chasten import constants +from chasten import database +from chasten import results CONFIGURATION_FILE_DEFAULT_CONTENTS = """ # chasten configuration diff --git a/chasten/main.py b/chasten/main.py index f6ed91f6..4b439dd1 100644 --- a/chasten/main.py +++ b/chasten/main.py @@ -2,7 +2,11 @@ import sys from pathlib import Path -from typing import Any, Dict, List, Tuple, Union +from typing import Any +from typing import Dict +from typing import List +from typing import Tuple +from typing import Union import typer import yaml @@ -10,21 +14,19 @@ from trogon import Trogon # type: ignore from typer.main import get_group -from chasten import ( - checks, - configuration, - constants, - database, - debug, - enumerations, - filesystem, - output, - process, - results, - server, - util, - validate, -) +from chasten import checks +from chasten import configuration +from chasten import constants +from chasten import database +from chasten import debug +from chasten import enumerations +from chasten import filesystem +from chasten import output +from chasten import process +from chasten import results +from chasten import server +from chasten import util +from chasten import validate # create a Typer object to support the command-line interface cli = typer.Typer() diff --git a/chasten/output.py b/chasten/output.py index a2958cc6..2e090738 100644 --- a/chasten/output.py +++ b/chasten/output.py @@ -3,14 +3,20 @@ import logging from copy import deepcopy from pathlib import Path -from typing import Any, Dict, List +from typing import Any +from typing import Dict +from typing import List from pyastgrep import search as pyastgrepsearch # type: ignore from rich.console import Console from rich.panel import Panel from rich.syntax import Syntax -from chasten import checks, configuration, constants, debug, results +from chasten import checks +from chasten import configuration +from chasten import constants +from chasten import debug +from chasten import results # declare a default logger logger: logging.Logger = logging.getLogger() diff --git a/chasten/process.py b/chasten/process.py index 5670b4e1..a701c059 100644 --- a/chasten/process.py +++ b/chasten/process.py @@ -1,12 +1,17 @@ """Analyze the abstract syntax tree, its XML-based representation, and/or the search results.""" import json -from typing import Any, Dict, List, Tuple, Union +from typing import Any +from typing import Dict +from typing import List +from typing import Tuple +from typing import Union from pyastgrep import search as pyastgrepsearch # type: ignore from thefuzz import fuzz # type: ignore -from chasten import constants, enumerations +from chasten import constants +from chasten import enumerations def include_or_exclude_checks( diff --git a/chasten/results.py b/chasten/results.py index a7effeb0..7b9fd95e 100644 --- a/chasten/results.py +++ b/chasten/results.py @@ -3,7 +3,9 @@ import uuid from datetime import datetime from pathlib import Path -from typing import List, Union, Optional +from typing import List +from typing import Optional +from typing import Union from pyastgrep import search as pyastgrepsearch # type: ignore from pydantic import BaseModel diff --git a/chasten/server.py b/chasten/server.py index acf75116..e6e813d5 100644 --- a/chasten/server.py +++ b/chasten/server.py @@ -4,7 +4,8 @@ import logging.handlers import socketserver -from chasten import constants, output +from chasten import constants +from chasten import output LOG_FILE = constants.server.Log_File HOST = constants.server.Localhost diff --git a/chasten/validate.py b/chasten/validate.py index 41f4d739..58705448 100644 --- a/chasten/validate.py +++ b/chasten/validate.py @@ -1,6 +1,9 @@ """Validate various aspects of configurations and command-line arguments.""" -from typing import Any, Dict, List, Tuple +from typing import Any +from typing import Dict +from typing import List +from typing import Tuple import jsonschema from jsonschema.exceptions import ValidationError diff --git a/tests/test_checks.py b/tests/test_checks.py index 98054a5b..68828c22 100644 --- a/tests/test_checks.py +++ b/tests/test_checks.py @@ -2,14 +2,14 @@ import hypothesis.strategies as st import pytest -from hypothesis import HealthCheck, given, settings +from hypothesis import HealthCheck +from hypothesis import given +from hypothesis import settings from hypothesis_jsonschema import from_schema -from chasten.checks import ( - check_match_count, - extract_min_max, - is_in_closed_interval, -) +from chasten.checks import check_match_count +from chasten.checks import extract_min_max +from chasten.checks import is_in_closed_interval JSON_SCHEMA_COUNT = { "type": "object", diff --git a/tests/test_configuration.py b/tests/test_configuration.py index 739572a4..184dd0fe 100644 --- a/tests/test_configuration.py +++ b/tests/test_configuration.py @@ -3,7 +3,8 @@ import logging import pytest -from hypothesis import given, strategies +from hypothesis import given +from hypothesis import strategies from chasten import configuration diff --git a/tests/test_constants.py b/tests/test_constants.py index d86f2c42..05723739 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -3,7 +3,8 @@ from dataclasses import FrozenInstanceError import pytest -from hypothesis import given, strategies +from hypothesis import given +from hypothesis import strategies from chasten import constants diff --git a/tests/test_debug.py b/tests/test_debug.py index 0303ea8d..e486f86d 100644 --- a/tests/test_debug.py +++ b/tests/test_debug.py @@ -2,7 +2,8 @@ import pytest -from chasten.debug import DebugDestination, DebugLevel +from chasten.debug import DebugDestination +from chasten.debug import DebugLevel def test_debug_level_values(): diff --git a/tests/test_filesystem.py b/tests/test_filesystem.py index 691e81e1..5d2e1adb 100644 --- a/tests/test_filesystem.py +++ b/tests/test_filesystem.py @@ -4,10 +4,12 @@ from unittest.mock import patch import pytest -from hypothesis import given, strategies +from hypothesis import given +from hypothesis import strategies from rich.tree import Tree -from chasten import constants, filesystem +from chasten import constants +from chasten import filesystem def test_valid_directory() -> None: diff --git a/tests/test_main.py b/tests/test_main.py index 17504aae..1f945020 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -5,7 +5,10 @@ from unittest.mock import patch import pytest -from hypothesis import HealthCheck, given, settings, strategies +from hypothesis import HealthCheck +from hypothesis import given +from hypothesis import settings +from hypothesis import strategies from typer.testing import CliRunner from chasten import main diff --git a/tests/test_util.py b/tests/test_util.py index d323fa5d..397adaa3 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,7 +1,8 @@ """Pytest test suite for the util module.""" import pytest -from hypothesis import given, strategies +from hypothesis import given +from hypothesis import strategies from chasten import util diff --git a/tests/test_validate.py b/tests/test_validate.py index dda4fe1d..c4c346b2 100644 --- a/tests/test_validate.py +++ b/tests/test_validate.py @@ -1,10 +1,12 @@ """Pytest test suite for the validate module.""" import pytest -from hypothesis import given, strategies +from hypothesis import given +from hypothesis import strategies from hypothesis_jsonschema import from_schema -from chasten.validate import JSON_SCHEMA_CONFIG, validate_configuration +from chasten.validate import JSON_SCHEMA_CONFIG +from chasten.validate import validate_configuration def test_validate_config_valid_realistic():