From 1ab35ed7c93e8b41efc31e504340eeee7aca6114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= Date: Sat, 5 Feb 2022 19:09:09 +0100 Subject: [PATCH] refactor / rename files into different project structure --- PyTeX/{ => build}/config/__init__.py | 0 PyTeX/{ => build}/config/enums.py | 0 PyTeX/{ => build}/config/formatting_config.py | 0 PyTeX/{ => build}/config/global_config.py | 2 +- PyTeX/{ => build}/paths/__init__.py | 0 PyTeX/{ => build}/paths/enums.py | 0 PyTeX/{ => build}/paths/pytex_path.py | 5 ++--- PyTeX/{ => build}/paths/relative_path.py | 4 ++-- PyTeX/build/pytex_file/pytex_file.py | 6 +++--- PyTeX/{formatting => build/utils}/__init__.py | 0 PyTeX/{ => build}/utils/conversions.py | 2 +- PyTeX/{utils => build/versioning}/__init__.py | 0 PyTeX/{versioning => build/versioning/git}/__init__.py | 0 .../git => build/versioning/version_info}/__init__.py | 0 PyTeX/{ => build}/versioning/version_info/constants.py | 0 PyTeX/{ => build}/versioning/version_info/version_info.py | 0 PyTeX/{versioning/version_info => format}/__init__.py | 0 PyTeX/{formatting => format}/formatter.py | 0 18 files changed, 9 insertions(+), 10 deletions(-) rename PyTeX/{ => build}/config/__init__.py (100%) rename PyTeX/{ => build}/config/enums.py (100%) rename PyTeX/{ => build}/config/formatting_config.py (100%) rename PyTeX/{ => build}/config/global_config.py (97%) rename PyTeX/{ => build}/paths/__init__.py (100%) rename PyTeX/{ => build}/paths/enums.py (100%) rename PyTeX/{ => build}/paths/pytex_path.py (92%) rename PyTeX/{ => build}/paths/relative_path.py (94%) rename PyTeX/{formatting => build/utils}/__init__.py (100%) rename PyTeX/{ => build}/utils/conversions.py (94%) rename PyTeX/{utils => build/versioning}/__init__.py (100%) rename PyTeX/{versioning => build/versioning/git}/__init__.py (100%) rename PyTeX/{versioning/git => build/versioning/version_info}/__init__.py (100%) rename PyTeX/{ => build}/versioning/version_info/constants.py (100%) rename PyTeX/{ => build}/versioning/version_info/version_info.py (100%) rename PyTeX/{versioning/version_info => format}/__init__.py (100%) rename PyTeX/{formatting => format}/formatter.py (100%) diff --git a/PyTeX/config/__init__.py b/PyTeX/build/config/__init__.py similarity index 100% rename from PyTeX/config/__init__.py rename to PyTeX/build/config/__init__.py diff --git a/PyTeX/config/enums.py b/PyTeX/build/config/enums.py similarity index 100% rename from PyTeX/config/enums.py rename to PyTeX/build/config/enums.py diff --git a/PyTeX/config/formatting_config.py b/PyTeX/build/config/formatting_config.py similarity index 100% rename from PyTeX/config/formatting_config.py rename to PyTeX/build/config/formatting_config.py diff --git a/PyTeX/config/global_config.py b/PyTeX/build/config/global_config.py similarity index 97% rename from PyTeX/config/global_config.py rename to PyTeX/build/config/global_config.py index 327a5fa..4f49f1f 100644 --- a/PyTeX/config/global_config.py +++ b/PyTeX/build/config/global_config.py @@ -2,7 +2,7 @@ from pathlib import Path, PurePath from typing import Optional from .formatting_config import BasicFormattingConfig -from ..paths import PyTeXRootDirType +from PyTeX.build.paths import PyTeXRootDirType class GlobalPyTeXConfig: diff --git a/PyTeX/paths/__init__.py b/PyTeX/build/paths/__init__.py similarity index 100% rename from PyTeX/paths/__init__.py rename to PyTeX/build/paths/__init__.py diff --git a/PyTeX/paths/enums.py b/PyTeX/build/paths/enums.py similarity index 100% rename from PyTeX/paths/enums.py rename to PyTeX/build/paths/enums.py diff --git a/PyTeX/paths/pytex_path.py b/PyTeX/build/paths/pytex_path.py similarity index 92% rename from PyTeX/paths/pytex_path.py rename to PyTeX/build/paths/pytex_path.py index 6353c9c..2691938 100644 --- a/PyTeX/paths/pytex_path.py +++ b/PyTeX/build/paths/pytex_path.py @@ -1,6 +1,5 @@ -from pathlib import Path, PurePath, PosixPath, PurePosixPath, PureWindowsPath, WindowsPath -from typing import Union -from PyTeX.config.global_config import GlobalPyTeXConfig +from pathlib import Path, PurePath, PurePosixPath, PureWindowsPath +from PyTeX.build.config.global_config import GlobalPyTeXConfig from .enums import PyTeXRootDirType import os diff --git a/PyTeX/paths/relative_path.py b/PyTeX/build/paths/relative_path.py similarity index 94% rename from PyTeX/paths/relative_path.py rename to PyTeX/build/paths/relative_path.py index f9f47de..902d116 100644 --- a/PyTeX/paths/relative_path.py +++ b/PyTeX/build/paths/relative_path.py @@ -1,8 +1,8 @@ import os from pathlib import Path, WindowsPath, PosixPath -from PyTeX.config import GlobalPyTeXConfig -from PyTeX.paths import PyTeXRootDirType +from PyTeX.build.config import GlobalPyTeXConfig +from PyTeX.build.paths import PyTeXRootDirType class RelativePath(Path): diff --git a/PyTeX/build/pytex_file/pytex_file.py b/PyTeX/build/pytex_file/pytex_file.py index b1ac7b2..5d78007 100644 --- a/PyTeX/build/pytex_file/pytex_file.py +++ b/PyTeX/build/pytex_file/pytex_file.py @@ -1,10 +1,10 @@ from typing import Optional, List, Dict, Tuple from PyTeX.build.build_info import BasicBuildInfo -from PyTeX.config import BasicFormattingConfig, GlobalPyTeXConfig +from PyTeX.build.config import GlobalPyTeXConfig from .enums import PyTeXFileType -from PyTeX.formatting.formatter import Formatter -from ...paths import RelativePath +from PyTeX.format.formatter import Formatter +from PyTeX.build.paths import RelativePath class PyTeXSourceFile: diff --git a/PyTeX/formatting/__init__.py b/PyTeX/build/utils/__init__.py similarity index 100% rename from PyTeX/formatting/__init__.py rename to PyTeX/build/utils/__init__.py diff --git a/PyTeX/utils/conversions.py b/PyTeX/build/utils/conversions.py similarity index 94% rename from PyTeX/utils/conversions.py rename to PyTeX/build/utils/conversions.py index fe429a6..d92a5fc 100644 --- a/PyTeX/utils/conversions.py +++ b/PyTeX/build/utils/conversions.py @@ -1,4 +1,4 @@ -from PyTeX.paths import PyTeXRootDirType +from PyTeX.build.paths import PyTeXRootDirType from PyTeX.build.pytex_file import PyTeXFileType diff --git a/PyTeX/utils/__init__.py b/PyTeX/build/versioning/__init__.py similarity index 100% rename from PyTeX/utils/__init__.py rename to PyTeX/build/versioning/__init__.py diff --git a/PyTeX/versioning/__init__.py b/PyTeX/build/versioning/git/__init__.py similarity index 100% rename from PyTeX/versioning/__init__.py rename to PyTeX/build/versioning/git/__init__.py diff --git a/PyTeX/versioning/git/__init__.py b/PyTeX/build/versioning/version_info/__init__.py similarity index 100% rename from PyTeX/versioning/git/__init__.py rename to PyTeX/build/versioning/version_info/__init__.py diff --git a/PyTeX/versioning/version_info/constants.py b/PyTeX/build/versioning/version_info/constants.py similarity index 100% rename from PyTeX/versioning/version_info/constants.py rename to PyTeX/build/versioning/version_info/constants.py diff --git a/PyTeX/versioning/version_info/version_info.py b/PyTeX/build/versioning/version_info/version_info.py similarity index 100% rename from PyTeX/versioning/version_info/version_info.py rename to PyTeX/build/versioning/version_info/version_info.py diff --git a/PyTeX/versioning/version_info/__init__.py b/PyTeX/format/__init__.py similarity index 100% rename from PyTeX/versioning/version_info/__init__.py rename to PyTeX/format/__init__.py diff --git a/PyTeX/formatting/formatter.py b/PyTeX/format/formatter.py similarity index 100% rename from PyTeX/formatting/formatter.py rename to PyTeX/format/formatter.py