Skip to content

Commit ee78cc2

Browse files
[refactor] fixed imports (#14)
1 parent 8a475fa commit ee78cc2

40 files changed

+105
-88
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ repos:
33
hooks:
44
- id: ruff
55
name: ruff
6-
entry: bash -c "cd python_coderunner && ruff check src/ tests/"
6+
entry: bash -c "cd python_coderunner && ruff check ."
77
language: system
88
types: [python]
99

1010
- id: ruff_format
1111
name: ruff_format
1212
# not in args, because entry is bash
13-
entry: bash -c "cd python_coderunner && ruff format --quiet"
13+
entry: bash -c "cd python_coderunner && ruff format --quiet ."
1414
language: system
1515
types: [python]
1616

1717
- id: isort
1818
name: isort
19-
entry: bash -c "cd python_coderunner && isort src/ tests/"
19+
entry: bash -c "cd python_coderunner && isort ."
2020
language: system
2121
types: [python]
2222

2323
- id: mypy
2424
name: mypy
25-
entry: bash -c "cd python_coderunner && mypy src/ tests/"
25+
entry: bash -c "cd python_coderunner && mypy ."
2626
language: system
2727
types: [python]
2828

2929
- id: pylint
3030
name: pylint
31-
entry: bash -c "cd python_coderunner && pylint src/ tests/"
31+
entry: bash -c "cd python_coderunner && pylint ."
3232
language: system
3333
types: [python]

autoload/coderunner.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,12 @@ def coderunner_on_exit():
6161
coderunner.on_exit()
6262

6363

64-
root_folder_path: str = os.path.dirname(vim.eval("s:script_folder_path"))
65-
sys.path[0:0] = [os.path.join(root_folder_path, "python_coderunner")]
64+
sys.path.insert(0, os.path.join(os.path.dirname(vim.eval("s:script_folder_path")), "python_coderunner"))
6665
try:
6766
from src.coderunner import TCodeRunner
6867
from src.coderunner_builder import TVimCodeRunnerBuilder
68+
69+
6970
coderunner: TCodeRunner = TVimCodeRunnerBuilder().build()
7071
except Exception as error:
7172
vim.command("redraw | echohl ErrorMsg")

python_coderunner/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ quote-style = "double"
4848

4949
[tool.pylint]
5050
[tool.pylint.main]
51-
ignore-paths = ["^tests/unit/",]
51+
ignore-paths = ["^tests/unit/", "^.venv/"]
5252
init-hook = """
5353
import os, sys
5454
cur_dir = os.getcwd()

python_coderunner/src/__init__.py

Whitespace-only changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from src.coderunner.coderunner import TCodeRunner
1+
from .coderunner import TCodeRunner

python_coderunner/src/coderunner/coderunner.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from typing import Callable, Optional
22

3-
from src.command_builder import ICommandBuilder
4-
from src.command_dispatcher_strategy_selector import (
3+
from ..command_builder import ICommandBuilder
4+
from ..command_dispatcher_strategy_selector import (
55
TBasicCommandDispatcherStrategySelector,
66
)
7-
from src.commands_executor import ICommandsExecutor
8-
from src.config_manager import TBasicConfigManager
9-
from src.editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
10-
from src.message_printer import IMessagePrinter
7+
from ..commands_executor import ICommandsExecutor
8+
from ..config_manager import TBasicConfigManager
9+
from ..editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
10+
from ..message_printer import IMessagePrinter
1111

1212

1313
class TCodeRunner:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
from src.coderunner_builder.interface import ICodeRunnerBuilder
2-
from src.coderunner_builder.vim_coderunner_builder import TVimCodeRunnerBuilder
1+
from .interface import ICodeRunnerBuilder
2+
from .vim_coderunner_builder import TVimCodeRunnerBuilder

python_coderunner/src/coderunner_builder/interface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from abc import ABC, abstractmethod
22
from typing import Optional
33

4-
from src.coderunner import TCodeRunner
4+
from ..coderunner import TCodeRunner
55

66

77
class ICodeRunnerBuilder(ABC):

python_coderunner/src/coderunner_builder/vim_coderunner_builder.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
import re
33
from typing import Dict, Optional
44

5-
from src.coderunner import TCodeRunner
6-
from src.coderunner_builder.interface import ICodeRunnerBuilder
7-
from src.command_builder import TInterpolatorCommandBuilder
8-
from src.command_builders_dispatcher import (
5+
from ..coderunner import TCodeRunner
6+
from ..command_builder import TInterpolatorCommandBuilder
7+
from ..command_builders_dispatcher import (
98
TFileExtCommandBuildersDispatcher,
109
TFileTypeCommandBuildersDispatcher,
1110
TGlobCommandBuildersDispatcher,
1211
TShebangCommandBuildersDispatcher,
1312
)
14-
from src.command_dispatcher_strategy_selector import (
13+
from ..command_dispatcher_strategy_selector import (
1514
TBasicCommandDispatcherStrategySelector,
1615
)
17-
from src.commands_executor import TVimCommandsExecutor
18-
from src.config_manager import (
16+
from ..commands_executor import TVimCommandsExecutor
17+
from ..config_manager import (
1918
TBasicConfigValidator,
2019
TVimConfigGetter,
2120
TVimConfigManager,
2221
)
23-
from src.editor import TVimEditor
24-
from src.editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
25-
from src.file_info_extractor import TVimFileInfoExtractor
26-
from src.message_printer import TVimMessagePrinter
27-
from src.project_info_extractor import TVimProjectInfoExtractor
22+
from ..editor import TVimEditor
23+
from ..editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
24+
from ..file_info_extractor import TVimFileInfoExtractor
25+
from ..message_printer import TVimMessagePrinter
26+
from ..project_info_extractor import TVimProjectInfoExtractor
27+
from .interface import ICodeRunnerBuilder
2828

2929

3030
class TVimCodeRunnerBuilder(ICodeRunnerBuilder):
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from src.command_builder.concatenator_command_builder import TConcatenatorCommandBuilder
2-
from src.command_builder.interface import ICommandBuilder
3-
from src.command_builder.interpolator_command_builder import TInterpolatorCommandBuilder
1+
from .concatenator_command_builder import TConcatenatorCommandBuilder
2+
from .interface import ICommandBuilder
3+
from .interpolator_command_builder import TInterpolatorCommandBuilder

0 commit comments

Comments
 (0)