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

benoit-dubreuil · Apr 26, 2021 · 7796f91 · 7796f91
2 parents f9dbf11 + 5905d85
commit 7796f91
Show file tree

Hide file tree

Showing 32 changed files with 41 additions and 42 deletions.
diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/location/msvc/cli.py b/conf/script/src/build_system/cmd/compiler/host/get_info/location/msvc/cli.py
@@ -6,7 +6,7 @@
 from ...cli import *
 from .impl import *
 from build_system.compiler import *
-from ext.error import *
+from error import *
 
 
 def _find_no_arg(compiler_installation_path: Optional[Path] = None) -> Union[Path, NoReturn]:

diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/location/msvc/impl.py b/conf/script/src/build_system/cmd/compiler/host/get_info/location/msvc/impl.py
@@ -5,8 +5,8 @@
 
 import vswhere
 
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
 
 _DEFAULT_REQUIRES: Final[list[str]] = [
     'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',

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
@@ -7,7 +7,7 @@
 
 from build_system.compiler import *
 from ext.cmd_integrity import *
-from ext.error import *
+from error import *
 
 
 def verify_compiler_path(compiler_path: Path) -> None:

diff --git a/conf/script/src/build_system/cmd/compiler/host/get_info/version/msvc/cli.py b/conf/script/src/build_system/cmd/compiler/host/get_info/version/msvc/cli.py
@@ -5,7 +5,7 @@
 
 from ...cli import *
 from build_system.compiler import *
-from ext.error import *
+from error import *
 from .impl import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/impl.py b/conf/script/src/build_system/cmd/hierarchy/clean_build_dir/impl.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Optional
 
-from ext.error import *
+from error import *
 from ..find_build_dir import *
 
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/create_build_dir/impl.py b/conf/script/src/build_system/cmd/hierarchy/create_build_dir/impl.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Optional
 
-from ext.error import *
+from error import *
 from file_structure import *
 from ..find_build_dir 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
@@ -5,7 +5,7 @@
 
 from build_system.build_target import *
 from build_system.compiler import *
-from ext.error import *
+from error import *
 from ext.more_path import *
 from .target_dir_creation import *
 from .target_dir_name_generation import *

diff --git a/...ld_system/cmd/hierarchy/create_targets_build_dirs_structure/target_dir_name_generation.py b/...ld_system/cmd/hierarchy/create_targets_build_dirs_structure/target_dir_name_generation.py
@@ -4,7 +4,7 @@
 
 from build_system.build_target import *
 from build_system.compiler import *
-from ext.error import *
+from error import *
 
 
 def generate_targets(compiler_instances: Optional[list[CompilerInstance]] = None) \

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_build_dir/impl.py b/conf/script/src/build_system/cmd/hierarchy/find_build_dir/impl.py
@@ -6,8 +6,8 @@
 from pathlib import Path
 from typing import Optional
 
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
 from file_structure import *
 from ..find_root_dir import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/conf_build_system.py b/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/conf_build_system.py
@@ -4,8 +4,8 @@
 from pathlib import Path
 from typing import Optional
 
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
 from file_structure import *
 from .impl import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/conf_meson_machine_files.py b/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/conf_meson_machine_files.py
@@ -4,8 +4,8 @@
 from pathlib import Path
 from typing import Optional
 
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
 from file_structure import *
 from .conf_build_system import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/impl.py b/conf/script/src/build_system/cmd/hierarchy/find_conf_dir/impl.py
@@ -4,8 +4,8 @@
 from pathlib import Path
 from typing import Optional
 
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
 from file_structure import *
 from ..find_root_dir import *
 

diff --git a/conf/script/src/build_system/cmd/hierarchy/find_root_dir/impl.py b/conf/script/src/build_system/cmd/hierarchy/find_root_dir/impl.py
@@ -9,8 +9,8 @@
 from pathlib import Path
 from typing import Optional
 
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
 from file_structure import *
 
 

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
@@ -12,7 +12,7 @@
 from build_system.compiler import *
 from cli import *
 from ext.cmd_integrity import *
-from ext.error import *
+from error import *
 from file_structure import *
 from .meson_machine_file_args import *
 

diff --git a/conf/script/src/build_system/compiler/installed_instance/compiler_instance.py b/conf/script/src/build_system/compiler/installed_instance/compiler_instance.py
@@ -1,16 +1,16 @@
 __all__ = ['CompilerInstance']
 
-from abc import ABCMeta, abstractmethod
 import contextlib
+from abc import ABCMeta, abstractmethod
 from dataclasses import dataclass
 from pathlib import Path
 from typing import NoReturn, Optional, Type, final
 
-from ..core import *
-from ..build_option import *
+from error import *
+from error.utils import *
 from host import *
-from ext.error import *
-from ext.error.utils import *
+from ..build_option import *
+from ..core import *
 
 
 @dataclass(order=True, frozen=True)

diff --git a/conf/script/src/build_system/compiler/installed_instance/gnu.py b/conf/script/src/build_system/compiler/installed_instance/gnu.py
@@ -4,13 +4,12 @@
 from dataclasses import dataclass
 from pathlib import Path
 
-from ..core import *
-from ..build_option import *
-from host import *
-from ext.error import *
-from ext.error.utils import *
-from .compiler_instance import *
+from error import *
+from error.utils import *
 from ext.cmd_integrity import *
+from .compiler_instance import *
+from ..build_option import *
+from ..core import *
 
 
 @dataclass(order=True, frozen=True)

diff --git a/conf/script/src/build_system/compiler/installed_instance/msvc.py b/conf/script/src/build_system/compiler/installed_instance/msvc.py
@@ -5,12 +5,12 @@
 from pathlib import Path
 from typing import Optional, final
 
-from ..core import *
-from ..build_option import *
-from .compiler_instance import *
 from build_system.cmd.compiler.host.get_info.location.msvc import *
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
+from .compiler_instance import *
+from ..build_option import *
+from ..core import *
 
 
 @final

diff --git a/conf/script/src/build_system/compiler/reqs/reqs.py b/conf/script/src/build_system/compiler/reqs/reqs.py
@@ -5,8 +5,8 @@
 from pathlib import Path
 from typing import Final
 
-from ext.error import *
-from ext.error.utils import *
+from error import *
+from error.utils import *
 from host import *
 from .scheme import *
 from ..core import *

diff --git a/conf/script/src/cli/arg_parsing.py b/conf/script/src/cli/arg_parsing.py
@@ -6,7 +6,7 @@
 from typing import AnyStr, Optional
 
 from .arg import *
-from ext.error import *
+from error import *
 from ext.more_typing import *
 
 

diff --git a/conf/script/src/cli/try_cmd.py b/conf/script/src/cli/try_cmd.py
@@ -3,7 +3,7 @@
 import argparse
 from typing import Callable
 
-from ext.error import *
+from error import *
 
 
 def try_cmd_except_managed_errors(cmd_func: Callable, arg_parser: argparse.ArgumentParser):

diff --git a/conf/script/src/ext/error/__init__.py → conf/script/src/error/__init__.py b/conf/script/src/ext/error/__init__.py → conf/script/src/error/__init__.py
diff --git a/conf/script/src/ext/error/core/__init__.py → conf/script/src/error/core/__init__.py b/conf/script/src/ext/error/core/__init__.py → conf/script/src/error/core/__init__.py
diff --git a/conf/script/src/ext/error/core/cli_exit.py → conf/script/src/error/core/cli_exit.py b/conf/script/src/ext/error/core/cli_exit.py → conf/script/src/error/core/cli_exit.py
diff --git a/conf/script/src/ext/error/core/cls_def.py → conf/script/src/error/core/cls_def.py b/conf/script/src/ext/error/core/cls_def.py → conf/script/src/error/core/cls_def.py
diff --git a/conf/script/src/ext/error/core/format.py → conf/script/src/error/core/format.py b/conf/script/src/ext/error/core/format.py → conf/script/src/error/core/format.py
diff --git a/conf/script/src/ext/error/core/managed.py → conf/script/src/error/core/managed.py b/conf/script/src/ext/error/core/managed.py → conf/script/src/error/core/managed.py
diff --git a/conf/script/src/ext/error/core/meta.py → conf/script/src/error/core/meta.py b/conf/script/src/ext/error/core/meta.py → conf/script/src/error/core/meta.py
diff --git a/conf/script/src/ext/error/core/status.py → conf/script/src/error/core/status.py b/conf/script/src/ext/error/core/status.py → conf/script/src/error/core/status.py
diff --git a/conf/script/src/ext/error/utils/__init__.py → conf/script/src/error/utils/__init__.py b/conf/script/src/ext/error/utils/__init__.py → conf/script/src/error/utils/__init__.py
diff --git a/...rc/ext/error/utils/try_external_errors.py → ...pt/src/error/utils/try_external_errors.py b/...rc/ext/error/utils/try_external_errors.py → ...pt/src/error/utils/try_external_errors.py
diff --git a/conf/script/src/test/test_ext/error/core/test_managed.py b/conf/script/src/test/test_ext/error/core/test_managed.py
@@ -4,7 +4,7 @@
 
 import unittest
 
-from ext.error import *
+from error import *
 from ext.meta_prog.introspection import *
 
 

diff --git a/conf/script/src/test/test_ext/error/core/test_meta.py b/conf/script/src/test/test_ext/error/core/test_meta.py
@@ -5,7 +5,7 @@
 import abc
 import unittest
 
-from ext.error import *
+from error import *
 from ext.meta_prog.introspection import *