Skip to content

Commit fd407b6

Browse files
committed
restructure modules for packaging
1 parent 5e248d5 commit fd407b6

21 files changed

+79
-80
lines changed
File renamed without changes.
File renamed without changes.

src/commands/list_dependencies.py renamed to devservices/commands/list_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from argparse import ArgumentParser
55
from argparse import Namespace
66

7-
from utils.services import find_matching_service
7+
from devservices.utils.services import find_matching_service
88

99

1010
def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:

src/commands/list_services.py renamed to devservices/commands/list_services.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from argparse import ArgumentParser
55
from argparse import Namespace
66

7-
from utils.devenv import get_coderoot
8-
from utils.services import get_local_services
7+
from devservices.utils.devenv import get_coderoot
8+
from devservices.utils.services import get_local_services
99

1010

1111
def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:

src/commands/logs.py renamed to devservices/commands/logs.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
from argparse import ArgumentParser
77
from argparse import Namespace
88

9-
from constants import DEVSERVICES_DIR_NAME
10-
from constants import DOCKER_COMPOSE_FILE_NAME
11-
from exceptions import DockerComposeError
12-
from utils.docker_compose import run_docker_compose_command
13-
from utils.services import find_matching_service
9+
from devservices.constants import DEVSERVICES_DIR_NAME
10+
from devservices.constants import DOCKER_COMPOSE_FILE_NAME
11+
from devservices.exceptions import DockerComposeError
12+
from devservices.utils.docker_compose import run_docker_compose_command
13+
from devservices.utils.services import find_matching_service
1414

1515

1616
def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:

src/commands/start.py renamed to devservices/commands/start.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
from argparse import ArgumentParser
66
from argparse import Namespace
77

8-
from constants import DEVSERVICES_DIR_NAME
9-
from constants import DOCKER_COMPOSE_FILE_NAME
10-
from exceptions import DockerComposeError
11-
from utils.console import Status
12-
from utils.docker_compose import run_docker_compose_command
13-
from utils.services import find_matching_service
8+
from devservices.constants import DEVSERVICES_DIR_NAME
9+
from devservices.constants import DOCKER_COMPOSE_FILE_NAME
10+
from devservices.exceptions import DockerComposeError
11+
from devservices.utils.console import Status
12+
from devservices.utils.docker_compose import run_docker_compose_command
13+
from devservices.utils.services import find_matching_service
1414

1515

1616
def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:

src/commands/status.py renamed to devservices/commands/status.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
from argparse import ArgumentParser
88
from argparse import Namespace
99

10-
from constants import DEVSERVICES_DIR_NAME
11-
from constants import DOCKER_COMPOSE_FILE_NAME
12-
from exceptions import DockerComposeError
13-
from utils.docker_compose import run_docker_compose_command
14-
from utils.services import find_matching_service
10+
from devservices.constants import DEVSERVICES_DIR_NAME
11+
from devservices.constants import DOCKER_COMPOSE_FILE_NAME
12+
from devservices.exceptions import DockerComposeError
13+
from devservices.utils.docker_compose import run_docker_compose_command
14+
from devservices.utils.services import find_matching_service
1515

1616
LINE_LENGTH = 40
1717

@@ -70,11 +70,10 @@ def status(args: Namespace) -> None:
7070
modes = service.config.modes
7171
# TODO: allow custom modes to be used
7272
mode_to_view = "default"
73-
mode_dependencies = modes[mode_to_view]
73+
mode_dependencies = " ".join(modes[mode_to_view])
7474
service_config_file_path = os.path.join(
7575
service.repo_path, DEVSERVICES_DIR_NAME, DOCKER_COMPOSE_FILE_NAME
7676
)
77-
mode_dependencies = " ".join(modes[mode_to_view])
7877
try:
7978
status_json = run_docker_compose_command(
8079
f"-f {service_config_file_path} ps {mode_dependencies} --format json"

src/commands/stop.py renamed to devservices/commands/stop.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
from argparse import ArgumentParser
66
from argparse import Namespace
77

8-
from constants import DEVSERVICES_DIR_NAME
9-
from constants import DOCKER_COMPOSE_FILE_NAME
10-
from exceptions import DockerComposeError
11-
from utils.console import Status
12-
from utils.docker_compose import run_docker_compose_command
13-
from utils.services import find_matching_service
8+
from devservices.constants import DEVSERVICES_DIR_NAME
9+
from devservices.constants import DOCKER_COMPOSE_FILE_NAME
10+
from devservices.exceptions import DockerComposeError
11+
from devservices.utils.console import Status
12+
from devservices.utils.docker_compose import run_docker_compose_command
13+
from devservices.utils.services import find_matching_service
1414

1515

1616
def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:

src/configs/service_config.py renamed to devservices/configs/service_config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from dataclasses import dataclass
55

66
import yaml
7-
from constants import DEVSERVICES_DIR_NAME
8-
from constants import DOCKER_COMPOSE_FILE_NAME
9-
from exceptions import ConfigNotFoundError
10-
from exceptions import ConfigParseError
11-
from exceptions import ConfigValidationError
127

8+
from devservices.constants import DEVSERVICES_DIR_NAME
9+
from devservices.constants import DOCKER_COMPOSE_FILE_NAME
10+
from devservices.exceptions import ConfigNotFoundError
11+
from devservices.exceptions import ConfigParseError
12+
from devservices.exceptions import ConfigValidationError
1313

1414
VALID_VERSIONS = [0.1]
1515

File renamed without changes.

0 commit comments

Comments
 (0)