diff --git a/rocrate_validator/cli/commands/profiles.py b/rocrate_validator/cli/commands/profiles.py index a559656b..4eb762cb 100644 --- a/rocrate_validator/cli/commands/profiles.py +++ b/rocrate_validator/cli/commands/profiles.py @@ -27,7 +27,7 @@ from rocrate_validator.cli.main import cli, click from rocrate_validator.colors import get_severity_color from rocrate_validator.constants import DEFAULT_PROFILE_IDENTIFIER -from rocrate_validator.io.output.text.layout.report import get_app_header_rule +from rocrate_validator.rocv_io.output.text.layout.report import get_app_header_rule from rocrate_validator.models import (LevelCollection, RequirementLevel, Severity) from rocrate_validator.utils import get_profiles_path, shorten_path diff --git a/rocrate_validator/cli/commands/validate.py b/rocrate_validator/cli/commands/validate.py index 46f4ce3a..df775fd5 100644 --- a/rocrate_validator/cli/commands/validate.py +++ b/rocrate_validator/cli/commands/validate.py @@ -29,11 +29,11 @@ from rocrate_validator.cli.main import cli from rocrate_validator.cli.ui.text.validate import ValidationCommandView from rocrate_validator.errors import ROCrateInvalidURIError -from rocrate_validator.io.input import get_single_char, multiple_choice -from rocrate_validator.io.output.console import Console -from rocrate_validator.io.output.json import JSONOutputFormatter -from rocrate_validator.io.output.text import TextOutputFormatter -from rocrate_validator.io.output.text.layout.report import ( +from rocrate_validator.rocv_io.input import get_single_char, multiple_choice +from rocrate_validator.rocv_io.output.console import Console +from rocrate_validator.rocv_io.output.json import JSONOutputFormatter +from rocrate_validator.rocv_io.output.text import TextOutputFormatter +from rocrate_validator.rocv_io.output.text.layout.report import ( LiveTextProgressLayout, get_app_header_rule) from rocrate_validator.models import (Severity, ValidationResult, ValidationSettings) diff --git a/rocrate_validator/cli/main.py b/rocrate_validator/cli/main.py index 3de5c588..a9495ba2 100644 --- a/rocrate_validator/cli/main.py +++ b/rocrate_validator/cli/main.py @@ -18,8 +18,8 @@ import rocrate_validator.log as logging from rocrate_validator.cli.utils import running_in_jupyter -from rocrate_validator.io.output.console import Console -from rocrate_validator.io.output.pager import SystemPager +from rocrate_validator.rocv_io.output.console import Console +from rocrate_validator.rocv_io.output.pager import SystemPager from rocrate_validator.utils import get_version # set up logging diff --git a/rocrate_validator/cli/ui/text/validate.py b/rocrate_validator/cli/ui/text/validate.py index 1f743a1f..473f415b 100644 --- a/rocrate_validator/cli/ui/text/validate.py +++ b/rocrate_validator/cli/ui/text/validate.py @@ -17,10 +17,10 @@ from typing import Any, Callable, Optional import rocrate_validator.log as logging -from rocrate_validator.io.output.console import Console -from rocrate_validator.io.output.pager import SystemPager -from rocrate_validator.io.output.text import TextOutputFormatter -from rocrate_validator.io.output.text.layout.report import ValidationReportLayout +from rocrate_validator.rocv_io.output.console import Console +from rocrate_validator.rocv_io.output.pager import SystemPager +from rocrate_validator.rocv_io.output.text import TextOutputFormatter +from rocrate_validator.rocv_io.output.text.layout.report import ValidationReportLayout from rocrate_validator.models import (ValidationResult, ValidationSettings, ValidationStatistics) diff --git a/rocrate_validator/io/__init__.py b/rocrate_validator/rocv_io/__init__.py similarity index 100% rename from rocrate_validator/io/__init__.py rename to rocrate_validator/rocv_io/__init__.py diff --git a/rocrate_validator/io/input.py b/rocrate_validator/rocv_io/input.py similarity index 100% rename from rocrate_validator/io/input.py rename to rocrate_validator/rocv_io/input.py diff --git a/rocrate_validator/io/output/__init__.py b/rocrate_validator/rocv_io/output/__init__.py similarity index 100% rename from rocrate_validator/io/output/__init__.py rename to rocrate_validator/rocv_io/output/__init__.py diff --git a/rocrate_validator/io/output/console.py b/rocrate_validator/rocv_io/output/console.py similarity index 100% rename from rocrate_validator/io/output/console.py rename to rocrate_validator/rocv_io/output/console.py diff --git a/rocrate_validator/io/output/json/__init__.py b/rocrate_validator/rocv_io/output/json/__init__.py similarity index 84% rename from rocrate_validator/io/output/json/__init__.py rename to rocrate_validator/rocv_io/output/json/__init__.py index 980106e9..ecbee630 100644 --- a/rocrate_validator/io/output/json/__init__.py +++ b/rocrate_validator/rocv_io/output/json/__init__.py @@ -2,8 +2,8 @@ from typing import Any, Optional import rocrate_validator.log as logging -from rocrate_validator.io.output import BaseOutputFormatter -from rocrate_validator.io.output.json.formatters import ( +from rocrate_validator.rocv_io.output import BaseOutputFormatter +from rocrate_validator.rocv_io.output.json.formatters import ( ValidationResultJSONOutputFormatter, ValidationResultsJSONOutputFormatter, ValidationStatisticsJSONOutputFormatter) from rocrate_validator.models import ValidationResult, ValidationStatistics diff --git a/rocrate_validator/io/output/json/formatters.py b/rocrate_validator/rocv_io/output/json/formatters.py similarity index 97% rename from rocrate_validator/io/output/json/formatters.py rename to rocrate_validator/rocv_io/output/json/formatters.py index afd6936a..ccebc4e0 100644 --- a/rocrate_validator/io/output/json/formatters.py +++ b/rocrate_validator/rocv_io/output/json/formatters.py @@ -3,8 +3,8 @@ from rich.console import ConsoleOptions, RenderResult import rocrate_validator.log as logging -from rocrate_validator.io.output import OutputFormatter -from rocrate_validator.io.output.console import Console +from rocrate_validator.rocv_io.output import OutputFormatter +from rocrate_validator.rocv_io.output.console import Console from rocrate_validator.models import (AggregatedValidationStatistics, CustomEncoder, ValidationResult, ValidationStatistics) diff --git a/rocrate_validator/io/output/pager.py b/rocrate_validator/rocv_io/output/pager.py similarity index 100% rename from rocrate_validator/io/output/pager.py rename to rocrate_validator/rocv_io/output/pager.py diff --git a/rocrate_validator/io/output/text/__init__.py b/rocrate_validator/rocv_io/output/text/__init__.py similarity index 100% rename from rocrate_validator/io/output/text/__init__.py rename to rocrate_validator/rocv_io/output/text/__init__.py diff --git a/rocrate_validator/io/output/text/formatters.py b/rocrate_validator/rocv_io/output/text/formatters.py similarity index 98% rename from rocrate_validator/io/output/text/formatters.py rename to rocrate_validator/rocv_io/output/text/formatters.py index b39300bd..a06f8e13 100644 --- a/rocrate_validator/io/output/text/formatters.py +++ b/rocrate_validator/rocv_io/output/text/formatters.py @@ -21,7 +21,7 @@ import rocrate_validator.log as logging from rocrate_validator.colors import get_severity_color -from rocrate_validator.io.output.text.layout.report import \ +from rocrate_validator.rocv_io.output.text.layout.report import \ ValidationReportLayout from rocrate_validator.models import ValidationResult, ValidationStatistics diff --git a/rocrate_validator/io/output/text/layout/__init__.py b/rocrate_validator/rocv_io/output/text/layout/__init__.py similarity index 100% rename from rocrate_validator/io/output/text/layout/__init__.py rename to rocrate_validator/rocv_io/output/text/layout/__init__.py diff --git a/rocrate_validator/io/output/text/layout/progress.py b/rocrate_validator/rocv_io/output/text/layout/progress.py similarity index 100% rename from rocrate_validator/io/output/text/layout/progress.py rename to rocrate_validator/rocv_io/output/text/layout/progress.py diff --git a/rocrate_validator/io/output/text/layout/report.py b/rocrate_validator/rocv_io/output/text/layout/report.py similarity index 99% rename from rocrate_validator/io/output/text/layout/report.py rename to rocrate_validator/rocv_io/output/text/layout/report.py index a038470b..7c21c0cf 100644 --- a/rocrate_validator/io/output/text/layout/report.py +++ b/rocrate_validator/rocv_io/output/text/layout/report.py @@ -30,7 +30,7 @@ import rocrate_validator.log as logging from rocrate_validator.colors import get_severity_color from rocrate_validator.events import Event, EventType -from rocrate_validator.io.output.console import Console +from rocrate_validator.rocv_io.output.console import Console from rocrate_validator.models import (Severity, ValidationContext, ValidationResult, ValidationSettings, ValidationStatistics)