Skip to content

Commit 6ecd4fc

Browse files
committed
refactor: update imports for API
1 parent b26250a commit 6ecd4fc

File tree

6 files changed

+9
-15
lines changed

6 files changed

+9
-15
lines changed

src/mscp/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from .common_utils.logging_config import set_logger
2626
from .common_utils.run_command import run_command
2727
from .common_utils.validate_rules import validate_yaml_file
28-
from .generate import baseline, checklist, guidance, local_report, mapping, translation
28+
from .generate import baseline, guidance, mapping, translation
2929

3030
logger.disable("mscp")
3131

@@ -51,9 +51,7 @@
5151
"remove_file",
5252
"run_command",
5353
"baseline",
54-
"checklist",
5554
"guidance",
56-
"local_report",
5755
"mapping",
5856
"parse_cli",
5957
"validate_yaml_file",

src/mscp/cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
from .common_utils import logger, set_logger, validate_yaml_file, supported_languages
1212
from .generate import (
1313
generate_baseline,
14-
generate_checklist,
1514
generate_guidance,
16-
generate_local_report,
1715
generate_mapping,
1816
generate_scap,
1917
generate_localize_template,
@@ -76,6 +74,8 @@ def parse_cli() -> None:
7674
description="CLI tool for managing baseline and compliance documents.",
7775
prog="mscp",
7876
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
77+
parents=[parent_parser],
78+
add_help=False,
7979
)
8080

8181
parser.add_argument(

src/mscp/common_utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# common_utils/__init__.py
22

33
from .config import config
4-
from .constants import CONFIG_PATH, SCHEMA_PATH
4+
from .constants import SCHEMA_PATH
55
from .customization import collect_overrides
66
from .file_handling import (
77
append_text,

src/mscp/common_utils/config.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99

1010
# Additional python modules
1111

12+
src_path = Path(__file__).parent.parent.parent
13+
project_path = src_path.parent
1214

13-
CONFIG_PATH: Path = Path.cwd() / "config" / "config.yaml"
15+
CONFIG_PATH: Path = project_path / "config" / "config.yaml"
1416

1517
try:
1618
logger.info("Attempting to open config file: {}", CONFIG_PATH)

src/mscp/common_utils/constants.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
# src/mscp/common_utils/constants.py
22

3-
# Standard python modules
4-
from pathlib import Path
5-
63
SCHEMA_PATH = "schema/mscp_rule.json"
7-
CONFIG_PATH: Path = Path.cwd() / "config" / "config.yaml"

src/mscp/generate/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
# generate/__init__.py
22

33
from .baseline import generate_baseline
4-
from .checklist import generate_checklist
54
from .guidance import generate_guidance
65
from .translation import (
76
generate_localize_template,
87
generate_mo_from_json,
98
)
10-
from .local_report import generate_local_report
9+
10+
# from .local_report import generate_local_report
1111
from .mapping import generate_mapping
1212
from .scap import generate_scap
1313

1414
__all__ = [
1515
"generate_baseline",
16-
"generate_checklist",
1716
"generate_guidance",
18-
"generate_local_report",
1917
"generate_mapping",
2018
"generate_scap",
2119
"generate_localize_template",

0 commit comments

Comments
 (0)