From 15dd058f73a52709bdac0ffa159275acc989535e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= Date: Sat, 5 Feb 2022 19:36:42 +0100 Subject: [PATCH] fix some circular imports --- PyTeX/build/config/__init__.py | 1 - PyTeX/build/config/global_config.py | 6 +++--- PyTeX/build/enums/__init__.py | 1 + PyTeX/build/{paths => enums}/enums.py | 0 PyTeX/build/paths/__init__.py | 1 - PyTeX/build/paths/pytex_path.py | 2 +- PyTeX/build/paths/relative_path.py | 4 ++-- PyTeX/{build/config => format}/enums.py | 0 PyTeX/{build/config => format}/formatting_config.py | 4 ++-- 9 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 PyTeX/build/enums/__init__.py rename PyTeX/build/{paths => enums}/enums.py (100%) rename PyTeX/{build/config => format}/enums.py (100%) rename PyTeX/{build/config => format}/formatting_config.py (90%) diff --git a/PyTeX/build/config/__init__.py b/PyTeX/build/config/__init__.py index f5b0076..3abc0f7 100644 --- a/PyTeX/build/config/__init__.py +++ b/PyTeX/build/config/__init__.py @@ -1,2 +1 @@ -from .formatting_config import BasicFormattingConfig from .global_config import GlobalPyTeXConfig diff --git a/PyTeX/build/config/global_config.py b/PyTeX/build/config/global_config.py index 4f49f1f..2d1f63e 100644 --- a/PyTeX/build/config/global_config.py +++ b/PyTeX/build/config/global_config.py @@ -1,8 +1,8 @@ from pathlib import Path, PurePath from typing import Optional -from .formatting_config import BasicFormattingConfig +from PyTeX.format.formatting_config import FormattingConfig -from PyTeX.build.paths import PyTeXRootDirType +from ..enums import PyTeXRootDirType class GlobalPyTeXConfig: @@ -12,7 +12,7 @@ class GlobalPyTeXConfig: _tex_root: Optional[Path] = None _wrapper_dir: Optional[PurePath] = None - _default_formatting_config: Optional[BasicFormattingConfig] = None + _default_formatting_config: Optional[FormattingConfig] = None _recursive: bool = True _overwrite_existing_files: bool = False diff --git a/PyTeX/build/enums/__init__.py b/PyTeX/build/enums/__init__.py new file mode 100644 index 0000000..dfbb933 --- /dev/null +++ b/PyTeX/build/enums/__init__.py @@ -0,0 +1 @@ +from .enums import * \ No newline at end of file diff --git a/PyTeX/build/paths/enums.py b/PyTeX/build/enums/enums.py similarity index 100% rename from PyTeX/build/paths/enums.py rename to PyTeX/build/enums/enums.py diff --git a/PyTeX/build/paths/__init__.py b/PyTeX/build/paths/__init__.py index a2ec5fb..fcfc9bf 100644 --- a/PyTeX/build/paths/__init__.py +++ b/PyTeX/build/paths/__init__.py @@ -1,2 +1 @@ -from .enums import PyTeXRootDirType from .relative_path import RelativePath diff --git a/PyTeX/build/paths/pytex_path.py b/PyTeX/build/paths/pytex_path.py index 2691938..2ee34e2 100644 --- a/PyTeX/build/paths/pytex_path.py +++ b/PyTeX/build/paths/pytex_path.py @@ -1,6 +1,6 @@ from pathlib import Path, PurePath, PurePosixPath, PureWindowsPath from PyTeX.build.config.global_config import GlobalPyTeXConfig -from .enums import PyTeXRootDirType +from PyTeX.build.enums.enums import PyTeXRootDirType import os diff --git a/PyTeX/build/paths/relative_path.py b/PyTeX/build/paths/relative_path.py index 902d116..14f7ba2 100644 --- a/PyTeX/build/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.build.config import GlobalPyTeXConfig -from PyTeX.build.paths import PyTeXRootDirType +from ..config import GlobalPyTeXConfig +from PyTeX.build.enums.enums import PyTeXRootDirType class RelativePath(Path): diff --git a/PyTeX/build/config/enums.py b/PyTeX/format/enums.py similarity index 100% rename from PyTeX/build/config/enums.py rename to PyTeX/format/enums.py diff --git a/PyTeX/build/config/formatting_config.py b/PyTeX/format/formatting_config.py similarity index 90% rename from PyTeX/build/config/formatting_config.py rename to PyTeX/format/formatting_config.py index 5d42a05..512e253 100644 --- a/PyTeX/build/config/formatting_config.py +++ b/PyTeX/format/formatting_config.py @@ -2,9 +2,9 @@ from typing import List, Optional, Union from .enums import NamingScheme, License -class BasicFormattingConfig: +class FormattingConfig: def __init__(self): - self._naming_scheme: Union[NamingScheme, str] = NamingScheme.clean # either some predefined scheme, or a formatting string + self._naming_scheme: Union[NamingScheme, str] = NamingScheme.clean self._author: Optional[str] = None self._license: Optional[List[License]] = None