Skip to content

Commit

Permalink
Merge branch 'feat/nullable-check-counts' into fix/local-checkfile
Browse files Browse the repository at this point in the history
  • Loading branch information
simojo committed Sep 22, 2023
2 parents 026e0dc + 015583a commit 8af0c93
Show file tree
Hide file tree
Showing 17 changed files with 91 additions and 44 deletions.
11 changes: 8 additions & 3 deletions chasten/checks.py
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
5 changes: 4 additions & 1 deletion chasten/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions chasten/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 18 additions & 16 deletions chasten/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,31 @@

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
from pyastgrep import search as pyastgrepsearch # type: ignore
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()
Expand Down
10 changes: 8 additions & 2 deletions chasten/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
9 changes: 7 additions & 2 deletions chasten/process.py
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 3 additions & 1 deletion chasten/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion chasten/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion chasten/validate.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions tests/test_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion tests/test_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion tests/test_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion tests/test_debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
6 changes: 4 additions & 2 deletions tests/test_filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/test_util.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 4 additions & 2 deletions tests/test_validate.py
Original file line number Diff line number Diff line change
@@ -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():
Expand Down

0 comments on commit 8af0c93

Please sign in to comment.