From d12067fbfda730f7e7cbd984b0938090bdd74c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:48:54 -0400 Subject: [PATCH 01/11] Added `utils` pkg --- conf/script/src/ext/utils/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 conf/script/src/ext/utils/__init__.py diff --git a/conf/script/src/ext/utils/__init__.py b/conf/script/src/ext/utils/__init__.py new file mode 100644 index 00000000..a9a2c5b3 --- /dev/null +++ b/conf/script/src/ext/utils/__init__.py @@ -0,0 +1 @@ +__all__ = [] From a9d90168a1d1754ed0f207f580a5ccb2e0a95433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:49:41 -0400 Subject: [PATCH 02/11] Moved `more_path.py` into `utils` pkg --- conf/script/src/ext/{ => utils}/more_path.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conf/script/src/ext/{ => utils}/more_path.py (100%) diff --git a/conf/script/src/ext/more_path.py b/conf/script/src/ext/utils/more_path.py similarity index 100% rename from conf/script/src/ext/more_path.py rename to conf/script/src/ext/utils/more_path.py From c5abfcd7623970a1f42f2328c6b9648ce328ad68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:49:52 -0400 Subject: [PATCH 03/11] Integrated the move --- .../cmd/hierarchy/create_targets_build_dirs_structure/impl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index a0536a0d..aaff0fa4 100644 --- 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.more_path import * +from ext.utils.more_path import * from .target_dir_creation import * from .target_dir_name_generation import * from .target_script_dir_creation import * From 1d520816ad6609a7b49583f4a6866602eca9db3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:50:28 -0400 Subject: [PATCH 04/11] Moved `cmd_integrity.py` into `utils` pkg --- conf/script/src/ext/{ => utils}/cmd_integrity.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conf/script/src/ext/{ => utils}/cmd_integrity.py (100%) diff --git a/conf/script/src/ext/cmd_integrity.py b/conf/script/src/ext/utils/cmd_integrity.py similarity index 100% rename from conf/script/src/ext/cmd_integrity.py rename to conf/script/src/ext/utils/cmd_integrity.py From 0912afe839726606ad53f47d9c8c6ba6d5dca68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:50:46 -0400 Subject: [PATCH 05/11] Integrated the move --- .../cmd/compiler/host/get_info/version/generic_fetch.py | 2 +- .../src/build_system/cmd/setup/_priv/meson/meson_utils.py | 2 +- conf/script/src/build_system/compiler/installed_instance/gnu.py | 2 +- 3 files changed, 3 insertions(+), 3 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 index 684702a2..23891ff8 100644 --- 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,7 +6,7 @@ from typing import AnyStr, Callable from build_system.compiler import * -from ext.cmd_integrity import * +from ext.utils.cmd_integrity import * from error 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 index 7e040d78..faeb5c30 100644 --- 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,7 +11,7 @@ from build_system.cmd.setup._priv.cli import * from build_system.compiler import * from cli import * -from ext.cmd_integrity import * +from ext.utils.cmd_integrity 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/gnu.py b/conf/script/src/build_system/compiler/installed_instance/gnu.py index 32d45dfe..d89ebf2b 100644 --- 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.cmd_integrity import * +from ext.utils.cmd_integrity import * from .compiler_instance import * from ..build_option import * from ..core import * From 947e67c306de2217af21ac3ba45bd873c48d2a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:51:28 -0400 Subject: [PATCH 06/11] Moved `more_typing.py` into `utils` pkg --- conf/script/src/ext/{ => utils}/more_typing.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conf/script/src/ext/{ => utils}/more_typing.py (100%) diff --git a/conf/script/src/ext/more_typing.py b/conf/script/src/ext/utils/more_typing.py similarity index 100% rename from conf/script/src/ext/more_typing.py rename to conf/script/src/ext/utils/more_typing.py From 93222f3f6e5d55c4d24adf9d9697e8250a842703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:52:00 -0400 Subject: [PATCH 07/11] Integrated the move --- .../src/build_system/cmd/hierarchy/clean_build_dir/cli.py | 2 +- .../src/build_system/cmd/hierarchy/create_build_dir/cli.py | 2 +- .../cmd/hierarchy/create_targets_build_dirs_structure/cli.py | 2 +- .../script/src/build_system/cmd/hierarchy/find_build_dir/cli.py | 2 +- conf/script/src/build_system/cmd/hierarchy/find_conf_dir/cli.py | 2 +- conf/script/src/build_system/cmd/setup/_priv/cli/colorize.py | 2 +- conf/script/src/build_system/cmd/setup/pub/cli_setup.py | 2 +- conf/script/src/cli/arg_parsing.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 index b4cf524c..7c8349fa 100644 --- 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.more_typing import AnyPath +from ext.utils.more_typing import AnyPath 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 index cee432a6..8ef894c0 100644 --- 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.more_typing import AnyPath +from ext.utils.more_typing import AnyPath 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 index 1ced889b..d7bf2789 100644 --- 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.more_typing import * +from ext.utils.more_typing import * from file_structure import * from .impl 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 index 1a451f6f..6f31fc40 100644 --- 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.more_typing import * +from ext.utils.more_typing 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 index 722545fd..2e3439b9 100644 --- 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.more_typing import AnyPath +from ext.utils.more_typing import AnyPath 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 index 61439bce..cee6d616 100644 --- 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.more_typing import * +from ext.utils.more_typing import * def colorize_header_label(header: str) -> str: 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 index 2199803c..cd0fe68e 100644 --- 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.more_typing import * +from ext.utils.more_typing import * from file_structure import * from .setup import * diff --git a/conf/script/src/cli/arg_parsing.py b/conf/script/src/cli/arg_parsing.py index bea20dd7..d67ffbe4 100644 --- a/conf/script/src/cli/arg_parsing.py +++ b/conf/script/src/cli/arg_parsing.py @@ -7,7 +7,7 @@ from .arg import * from error import * -from ext.more_typing import * +from ext.utils.more_typing import * def add_optional_path_arg(arg_parser: argparse.ArgumentParser, path_arg: CLIArg = CLIArg.create_default_path_arg(), From e31e305169e6c5bcc0ac07dc3b951b619a3d5cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:52:16 -0400 Subject: [PATCH 08/11] Enable auto importing --- conf/script/src/ext/utils/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/script/src/ext/utils/__init__.py b/conf/script/src/ext/utils/__init__.py index a9a2c5b3..e69de29b 100644 --- a/conf/script/src/ext/utils/__init__.py +++ b/conf/script/src/ext/utils/__init__.py @@ -1 +0,0 @@ -__all__ = [] From da7b064107c87e9493694e0d532b50ac37825334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:52:49 -0400 Subject: [PATCH 09/11] Renamed module --- conf/script/src/ext/utils/{more_typing.py => path_typing.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conf/script/src/ext/utils/{more_typing.py => path_typing.py} (100%) diff --git a/conf/script/src/ext/utils/more_typing.py b/conf/script/src/ext/utils/path_typing.py similarity index 100% rename from conf/script/src/ext/utils/more_typing.py rename to conf/script/src/ext/utils/path_typing.py From debb9d811db243f9ca41e17d4b57735d1fda7770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:53:23 -0400 Subject: [PATCH 10/11] Integrated the renaming --- .../src/build_system/cmd/hierarchy/clean_build_dir/cli.py | 2 +- .../src/build_system/cmd/hierarchy/create_build_dir/cli.py | 2 +- .../cmd/hierarchy/create_targets_build_dirs_structure/cli.py | 2 +- .../script/src/build_system/cmd/hierarchy/find_build_dir/cli.py | 2 +- conf/script/src/build_system/cmd/hierarchy/find_conf_dir/cli.py | 2 +- conf/script/src/build_system/cmd/setup/_priv/cli/colorize.py | 2 +- conf/script/src/build_system/cmd/setup/pub/cli_setup.py | 2 +- conf/script/src/cli/arg_parsing.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 index 7c8349fa..ae2b1c0e 100644 --- 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.more_typing import AnyPath +from ext.utils.path_typing import AnyPath 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 index 8ef894c0..632c414c 100644 --- 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.more_typing import AnyPath +from ext.utils.path_typing import AnyPath 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 index d7bf2789..869d7bb8 100644 --- 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.more_typing import * +from ext.utils.path_typing import * from file_structure import * from .impl 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 index 6f31fc40..d9258515 100644 --- 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.more_typing import * +from ext.utils.path_typing 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 index 2e3439b9..bc303d6e 100644 --- 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.more_typing import AnyPath +from ext.utils.path_typing import AnyPath 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 index cee6d616..6f7f78cf 100644 --- 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.more_typing import * +from ext.utils.path_typing import * def colorize_header_label(header: str) -> str: 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 index cd0fe68e..6be0f919 100644 --- 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.more_typing import * +from ext.utils.path_typing import * from file_structure import * from .setup import * diff --git a/conf/script/src/cli/arg_parsing.py b/conf/script/src/cli/arg_parsing.py index d67ffbe4..b1769200 100644 --- a/conf/script/src/cli/arg_parsing.py +++ b/conf/script/src/cli/arg_parsing.py @@ -7,7 +7,7 @@ from .arg import * from error import * -from ext.utils.more_typing import * +from ext.utils.path_typing import * def add_optional_path_arg(arg_parser: argparse.ArgumentParser, path_arg: CLIArg = CLIArg.create_default_path_arg(), From 598a12cd799ef6e382fa6a560d68fe82484fd83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dubreuil?= Date: Mon, 26 Apr 2021 18:53:34 -0400 Subject: [PATCH 11/11] Optimized imports --- conf/script/src/build_system/cmd/hierarchy/find_conf_dir/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index bc303d6e..dd58e35d 100644 --- 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 AnyPath +from ext.utils.path_typing import * from file_structure import * from .impl import *