Merge branch 'dev' into feature/#151/represent-local-env

benoit-dubreuil · Apr 27, 2021 · b25bdd2 · b25bdd2
2 parents d39175c + 96f8cc3
commit b25bdd2
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 13 deletions.
diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/version/generic_fetch.py b/conf/script/src/build_system/cmd/compiler/host/get_info/version/generic_fetch.py
@@ -6,8 +6,8 @@
 from typing import AnyStr, Callable
 
 from build_system.compiler import *
-from ext.utils.cmd_integrity import *
 from error import *
+from ext.utils.path import *
 
 
 def verify_compiler_path(compiler_path: Path) -> None:

diff --git a/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/cli.py
@@ -5,7 +5,7 @@
 import colorama
 
 from cli import *
-from ext.utils.path_typing import AnyPath
+from ext.utils.path import *
 from file_structure import *
 from .impl import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_build_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/create_build_dir/cli.py
@@ -5,7 +5,7 @@
 import colorama
 
 from cli import *
-from ext.utils.path_typing import AnyPath
+from ext.utils.path import *
 from file_structure import *
 from .impl import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/cli.py b/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/cli.py
@@ -5,7 +5,7 @@
 import colorama
 
 from cli import *
-from ext.utils.path_typing import *
+from ext.utils.path import *
 from file_structure import *
 from .impl import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/impl.py b/conf/script/src/build_system/cmd/hierarchy/create_targets_build_dirs_structure/impl.py
@@ -6,7 +6,7 @@
 from build_system.build_target import *
 from build_system.compiler import *
 from error import *
-from ext.utils.more_path import *
+from ext.utils.path import *
 from .target_dir_creation import *
 from .target_dir_name_generation import *
 from .target_script_dir_creation import *

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_build_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/find_build_dir/cli.py
@@ -5,7 +5,7 @@
 import colorama
 
 from cli import *
-from ext.utils.path_typing import *
+from ext.utils.path import *
 from file_structure import *
 from .impl import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/cli.py b/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/cli.py
@@ -5,7 +5,7 @@
 import colorama
 
 from cli import *
-from ext.utils.path_typing import *
+from ext.utils.path import *
 from file_structure import *
 from .impl import *
 

diff --git a/conf/script/src/build_system/cmd/setup/_priv/cli/colorize.py b/conf/script/src/build_system/cmd/setup/_priv/cli/colorize.py
@@ -4,7 +4,7 @@
 
 import colorama
 
-from ext.utils.path_typing import *
+from ext.utils.path import *
 
 
 def colorize_header_label(header: str) -> str:

diff --git a/conf/script/src/build_system/cmd/setup/_priv/meson/meson_utils.py b/conf/script/src/build_system/cmd/setup/_priv/meson/meson_utils.py
@@ -11,8 +11,8 @@
 from build_system.cmd.setup._priv.cli import *
 from build_system.compiler import *
 from cli import *
-from ext.utils.cmd_integrity import *
 from error import *
+from ext.utils.path import *
 from file_structure import *
 from .meson_machine_file_args import *
 

diff --git a/conf/script/src/build_system/cmd/setup/pub/cli_setup.py b/conf/script/src/build_system/cmd/setup/pub/cli_setup.py
@@ -5,7 +5,7 @@
 import colorama
 
 from cli import *
-from ext.utils.path_typing import *
+from ext.utils.path import *
 from file_structure import *
 from .setup import *
 

diff --git a/conf/script/src/build_system/compiler/installed_instance/gnu.py b/conf/script/src/build_system/compiler/installed_instance/gnu.py
@@ -6,7 +6,7 @@
 
 from error import *
 from error.utils import *
-from ext.utils.cmd_integrity import *
+from ext.utils.path import *
 from .compiler_instance import *
 from ..build_option import *
 from ..core import *

diff --git a/conf/script/src/cli/arg_parsing.py b/conf/script/src/cli/arg_parsing.py
@@ -5,9 +5,9 @@
 from pathlib import Path
 from typing import AnyStr, Optional
 
-from .arg import *
 from error import *
-from ext.utils.path_typing import *
+from ext.utils.path import *
+from .arg import *
 
 
 def add_optional_path_arg(arg_parser: argparse.ArgumentParser, path_arg: CLIArg = CLIArg.create_default_path_arg(),

diff --git a/conf/script/src/ext/utils/__init__.py b/conf/script/src/ext/utils/__init__.py
@@ -0,0 +1 @@
+from .path import *
diff --git a/conf/script/src/ext/utils/path/__init__.py b/conf/script/src/ext/utils/path/__init__.py
@@ -0,0 +1,3 @@
+from .cmd_integrity import *
+from .more_path import *
+from .path_typing import *
diff --git a/conf/script/src/ext/utils/cmd_integrity.py → ...cript/src/ext/utils/path/cmd_integrity.py b/conf/script/src/ext/utils/cmd_integrity.py → ...cript/src/ext/utils/path/cmd_integrity.py
diff --git a/conf/script/src/ext/utils/more_path.py → conf/script/src/ext/utils/path/more_path.py b/conf/script/src/ext/utils/more_path.py → conf/script/src/ext/utils/path/more_path.py
diff --git a/conf/script/src/ext/utils/path_typing.py → .../script/src/ext/utils/path/path_typing.py b/conf/script/src/ext/utils/path_typing.py → .../script/src/ext/utils/path/path_typing.py