From 94b5f28567f5a48cb24bc8c8febac364f97bbe7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= <git@maximilian-kessler.de>
Date: Mon, 7 Feb 2022 18:36:30 +0100
Subject: [PATCH] optimize imports and reformat files

---
 PyTeX/build/build/build_dir_spec.py             |  1 +
 PyTeX/build/build/builder.py                    |  6 ++----
 PyTeX/build/build/pytex_config.py               |  3 +--
 PyTeX/build/enums/__init__.py                   |  2 +-
 PyTeX/build/paths/relative_path.py              |  1 +
 PyTeX/build/pytex_file/enums.py                 |  2 --
 PyTeX/build/pytex_file/pytex_file.py            |  8 ++++----
 PyTeX/build/versioning/git/recent.py            |  7 ++++---
 .../versioning/version_info/version_info.py     |  4 ++--
 PyTeX/exceptions/__init__.py                    |  1 -
 PyTeX/format/config.py                          |  3 +--
 PyTeX/format/constants.py                       |  2 +-
 PyTeX/format/dict_formatter.py                  |  7 ++++---
 PyTeX/format/formatterif.py                     |  3 ++-
 PyTeX/format/formatting_config.py               |  4 ++--
 PyTeX/format/generic_text.py                    |  1 +
 PyTeX/format/git_version_info.py                |  6 +++---
 PyTeX/format/macros.py                          |  5 +++--
 PyTeX/format/pytex_formatter.py                 | 15 ++++++++-------
 PyTeX/format/tex_formatter.py                   |  7 ++++---
 PyTeX/logger/logger.py                          |  1 -
 PyTeX/tmp/generate_properties.py                |  6 +++---
 PyTeX/tmp/pytex_path.py                         |  3 ++-
 main.py                                         | 17 +++--------------
 24 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/PyTeX/build/build/build_dir_spec.py b/PyTeX/build/build/build_dir_spec.py
index 41397e5..a477a4f 100644
--- a/PyTeX/build/build/build_dir_spec.py
+++ b/PyTeX/build/build/build_dir_spec.py
@@ -1,5 +1,6 @@
 from pathlib import Path, PurePath
 from typing import Optional, Dict
+
 from .constants import *
 from ...format.config import Config
 
diff --git a/PyTeX/build/build/builder.py b/PyTeX/build/build/builder.py
index 4e01bfc..b108875 100644
--- a/PyTeX/build/build/builder.py
+++ b/PyTeX/build/build/builder.py
@@ -1,10 +1,10 @@
-from typing import Optional
 from pathlib import Path
+from typing import Optional
 
 from PyTeX.build.build import BuildDirConfig
 from PyTeX.build.enums import PyTeXRootDirType
-from ...logger import logger
 from .pytex_config import PyTeXConfig
+from ...logger import logger
 
 
 class PyTeXBuilder:
@@ -64,5 +64,3 @@ class PyTeXBuilder:
 
     def _build(self):
         logger.info("Starting build")
-
-
diff --git a/PyTeX/build/build/pytex_config.py b/PyTeX/build/build/pytex_config.py
index 8c0a783..876b50b 100644
--- a/PyTeX/build/build/pytex_config.py
+++ b/PyTeX/build/build/pytex_config.py
@@ -2,8 +2,8 @@ from typing import Optional, Dict
 
 from PyTeX.build.build import BuildDirConfig
 from PyTeX.format.formatting_config import FormattingConfig
-from ...format.config import Config
 from .constants import *
+from ...format.config import Config
 
 
 class PyTeXConfig(Config):
@@ -96,4 +96,3 @@ class PyTeXConfig(Config):
             return FormattingConfig()
         else:
             return self._default_formatting_config
-
diff --git a/PyTeX/build/enums/__init__.py b/PyTeX/build/enums/__init__.py
index dfbb933..b02681c 100644
--- a/PyTeX/build/enums/__init__.py
+++ b/PyTeX/build/enums/__init__.py
@@ -1 +1 @@
-from .enums import *
\ No newline at end of file
+from .enums import *
diff --git a/PyTeX/build/paths/relative_path.py b/PyTeX/build/paths/relative_path.py
index e19f14b..a3c39c8 100644
--- a/PyTeX/build/paths/relative_path.py
+++ b/PyTeX/build/paths/relative_path.py
@@ -7,6 +7,7 @@ class RelativePath:
     """
     Represents a path that knows of its corresponding root directory
     """
+
     def __init__(
             self,
             root_dir: Path,
diff --git a/PyTeX/build/pytex_file/enums.py b/PyTeX/build/pytex_file/enums.py
index ee953d0..3df5313 100644
--- a/PyTeX/build/pytex_file/enums.py
+++ b/PyTeX/build/pytex_file/enums.py
@@ -1,8 +1,6 @@
 from enum import Enum
 
 
-
-
 class PyTeXFileType(Enum):
     PyTeXSourceFile = 'PyTeXSourceFile'
     TeXSourceFile = 'TeXSourceFile'
diff --git a/PyTeX/build/pytex_file/pytex_file.py b/PyTeX/build/pytex_file/pytex_file.py
index 01ac1d0..0872d3c 100644
--- a/PyTeX/build/pytex_file/pytex_file.py
+++ b/PyTeX/build/pytex_file/pytex_file.py
@@ -1,9 +1,9 @@
-from typing import Optional, List, Dict, Tuple, Union
 from pathlib import Path
-from .enums import PyTeXFileType
-from PyTeX.format.formatterif import FormatterIF
+from typing import Optional, List, Dict, Tuple, Union
+
 from PyTeX.build.paths import RelativePath
-from ...format.enums import TeXType
+from PyTeX.format.formatterif import FormatterIF
+from .enums import PyTeXFileType
 
 
 class PyTeXSourceFile:
diff --git a/PyTeX/build/versioning/git/recent.py b/PyTeX/build/versioning/git/recent.py
index 637dee3..cd26402 100644
--- a/PyTeX/build/versioning/git/recent.py
+++ b/PyTeX/build/versioning/git/recent.py
@@ -1,6 +1,7 @@
-import git
-from typing import Union, Optional, List
 from pathlib import Path
+from typing import Union, Optional, List
+
+import git
 
 
 def get_latest_commit(repo):
@@ -11,7 +12,7 @@ def get_latest_commit(repo):
 
 
 def is_recent(file: Path, repo: git.Repo, compare: Optional[Union[git.Commit, List[git.Commit]]] = None) -> Optional[
-        bool]:
+    bool]:
     """
     :param file: file to check
     :param repo: repo that the file belongs to
diff --git a/PyTeX/build/versioning/version_info/version_info.py b/PyTeX/build/versioning/version_info/version_info.py
index 0aa4587..429c9a7 100644
--- a/PyTeX/build/versioning/version_info/version_info.py
+++ b/PyTeX/build/versioning/version_info/version_info.py
@@ -13,10 +13,10 @@ class FileVersionInfo:
 
         self._source_repository_version: Optional[GitVersionInfo] = \
             GitVersionInfo(dictionary[JSON_REPOSITORY]) if JSON_REPOSITORY in dictionary.keys() \
-            else None
+                else None
         self._pytex_repository_version: Optional[GitVersionInfo] = \
             GitVersionInfo(dictionary[JSON_PYTEX]) if JSON_PYTEX in dictionary.keys() \
-            else None
+                else None
 
     @property
     def md5_checksum(self) -> str:
diff --git a/PyTeX/exceptions/__init__.py b/PyTeX/exceptions/__init__.py
index b1fef70..e433e30 100644
--- a/PyTeX/exceptions/__init__.py
+++ b/PyTeX/exceptions/__init__.py
@@ -1,3 +1,2 @@
-
 class PyTeXException(Exception):
     pass
diff --git a/PyTeX/format/config.py b/PyTeX/format/config.py
index b94ea3f..3ba24cf 100644
--- a/PyTeX/format/config.py
+++ b/PyTeX/format/config.py
@@ -85,7 +85,6 @@ class Config:
 
 
 def recursive_merge_dictionaries(dict1: Dict, dict2: Dict) -> Dict:
-
     aux1 = {
         k: v for k, v in dict1.items() if type(v) == dict
     }
@@ -95,4 +94,4 @@ def recursive_merge_dictionaries(dict1: Dict, dict2: Dict) -> Dict:
     merged = {
         k: recursive_merge_dictionaries(v, aux2[k]) for k, v in aux1.items() if k in aux2.keys()
     }
-    return dict1 | dict2 | merged
\ No newline at end of file
+    return dict1 | dict2 | merged
diff --git a/PyTeX/format/constants.py b/PyTeX/format/constants.py
index adff2ac..b1c08cf 100644
--- a/PyTeX/format/constants.py
+++ b/PyTeX/format/constants.py
@@ -31,4 +31,4 @@ YAML_TEX_TYPE = 'type'
 YAML_TEXT = 'text'
 YAML_REPO = 'repo'
 YAML_PYTEX = 'pytex'
-YAML_DOCSTRIP = 'docstrip'
\ No newline at end of file
+YAML_DOCSTRIP = 'docstrip'
diff --git a/PyTeX/format/dict_formatter.py b/PyTeX/format/dict_formatter.py
index 22f53dc..ded7ddd 100644
--- a/PyTeX/format/dict_formatter.py
+++ b/PyTeX/format/dict_formatter.py
@@ -1,8 +1,9 @@
+import csv
 from pathlib import Path
 from typing import List, Dict, Tuple, Optional
-import csv
-from .pytex_formatter import PyTeXFormatter
+
 from .constants import *
+from .pytex_formatter import PyTeXFormatter
 from ..logger import logger
 
 
@@ -58,7 +59,7 @@ class DictFormatter(PyTeXFormatter):
                 dict_name=self._dict_name,
                 language=language
             )
-            lines += ['\n']*2
+            lines += ['\n'] * 2
             for key in self.translations[language].keys():
                 if self.translations[language][key].strip() != '':
                     lines += r'\providetranslation{{{key}}}{{{translation}}}'.format(
diff --git a/PyTeX/format/formatterif.py b/PyTeX/format/formatterif.py
index bc85302..3228073 100644
--- a/PyTeX/format/formatterif.py
+++ b/PyTeX/format/formatterif.py
@@ -1,5 +1,5 @@
-from typing import List, Optional, Dict, Tuple
 from pathlib import Path
+from typing import List, Optional, Dict, Tuple
 
 from .config import Config
 
@@ -9,6 +9,7 @@ class FormatterIF:
     A formatter is bound to a specific input file with some
     building configuration.
     """
+
     def __init__(
             self,
             input_file: Optional[Path] = None,
diff --git a/PyTeX/format/formatting_config.py b/PyTeX/format/formatting_config.py
index 5ee48a2..8a07b27 100644
--- a/PyTeX/format/formatting_config.py
+++ b/PyTeX/format/formatting_config.py
@@ -1,11 +1,11 @@
 from typing import List, Optional, Dict, Union
 
 from .config import Config
+from .constants import *
 from .enums import NamingScheme
+from .enums import TeXType, TeXFlavour
 from .generic_text import GenericText
 from .git_version_info import GitVersionInfo
-from .constants import *
-from .enums import TeXType, TeXFlavour
 
 
 class VersionInfo:
diff --git a/PyTeX/format/generic_text.py b/PyTeX/format/generic_text.py
index cd0b99d..2af91fb 100644
--- a/PyTeX/format/generic_text.py
+++ b/PyTeX/format/generic_text.py
@@ -1,5 +1,6 @@
 from pathlib import Path
 from typing import Union, List, Optional
+
 from ..logger import logger
 
 
diff --git a/PyTeX/format/git_version_info.py b/PyTeX/format/git_version_info.py
index c39abb2..48c5ef0 100644
--- a/PyTeX/format/git_version_info.py
+++ b/PyTeX/format/git_version_info.py
@@ -15,10 +15,10 @@ class GitVersionInfo:
         self._commit_hash: str = dictionary[JSON_COMMIT_HASH]
         self._branch: Optional[str] = \
             dictionary[JSON_BRANCH] if JSON_BRANCH in dictionary.keys() \
-            else None
+                else None
         self._version: Optional[str] = \
             dictionary[JSON_VERSION] if JSON_VERSION in dictionary.keys() \
-            else None
+                else None
 
     @property
     def is_dirty(self) -> bool:
@@ -34,4 +34,4 @@ class GitVersionInfo:
 
     @property
     def branch(self) -> Optional[str]:
-        return self._branch
\ No newline at end of file
+        return self._branch
diff --git a/PyTeX/format/macros.py b/PyTeX/format/macros.py
index f3a2d51..2c4354e 100644
--- a/PyTeX/format/macros.py
+++ b/PyTeX/format/macros.py
@@ -1,6 +1,7 @@
-from typing import List, Union
-from enum import Enum
 import re
+from enum import Enum
+from typing import List, Union
+
 from .constants import *
 
 
diff --git a/PyTeX/format/pytex_formatter.py b/PyTeX/format/pytex_formatter.py
index 7073979..986156a 100644
--- a/PyTeX/format/pytex_formatter.py
+++ b/PyTeX/format/pytex_formatter.py
@@ -1,11 +1,12 @@
+import re
 from pathlib import Path
-from typing import Optional, List
-from .formatting_config import FormattingConfig
+from typing import Optional
+
+from .constants import *
 from .enums import TeXType, TeXFlavour
 from .formatterif import FormatterIF
+from .formatting_config import FormattingConfig
 from .generic_text import GenericText
-import re
-from .constants import *
 from ..logger import logger
 
 
@@ -119,8 +120,8 @@ class PyTeXFormatter(FormatterIF):
     def make_header(self, **kwargs) -> str:
         return '\n'.join(
             [
-                '%'*80,
-                self.header.format(**kwargs), # TODO: add standard keywords here
-                '%'*80
+                '%' * 80,
+                self.header.format(**kwargs),  # TODO: add standard keywords here
+                '%' * 80
             ]
         )
diff --git a/PyTeX/format/tex_formatter.py b/PyTeX/format/tex_formatter.py
index 74771dc..fe5ccea 100644
--- a/PyTeX/format/tex_formatter.py
+++ b/PyTeX/format/tex_formatter.py
@@ -1,7 +1,8 @@
-from typing import List, TextIO, Optional, Tuple, Dict
 from pathlib import Path
-from .pytex_formatter import PyTeXFormatter
+from typing import List, TextIO, Optional, Tuple, Dict
+
 from .macros import Macro
+from .pytex_formatter import PyTeXFormatter
 
 
 class LineStream:
@@ -38,7 +39,7 @@ class LineStream:
         self._cached_lines[pos] = line
 
     def reserve_lines(self, num_lines):
-        for i in range(0, num_lines - len(self._cached_lines) -1):
+        for i in range(0, num_lines - len(self._cached_lines) - 1):
             self._cached_lines.append(
                 self._handle.readline()
             )
diff --git a/PyTeX/logger/logger.py b/PyTeX/logger/logger.py
index c519b4d..04f6bd9 100644
--- a/PyTeX/logger/logger.py
+++ b/PyTeX/logger/logger.py
@@ -1,4 +1,3 @@
-import os
 import logging
 
 formatter = logging.Formatter("[{name}] [{levelname}] {message}", style="{")
diff --git a/PyTeX/tmp/generate_properties.py b/PyTeX/tmp/generate_properties.py
index 600f904..226bd41 100644
--- a/PyTeX/tmp/generate_properties.py
+++ b/PyTeX/tmp/generate_properties.py
@@ -1,7 +1,7 @@
-from typing import Tuple, Union, List, Any, Optional
+from typing import Tuple, Union, List, Any
+
 from PyTeX.format.enums import NamingScheme
 from PyTeX.format.generic_text import GenericText
-from PyTeX.format.git_version_info import GitVersionInfo
 
 
 def generate_properties(props):
@@ -60,6 +60,7 @@ if __name__ == "__main__":
     )
     print(out2)
 
+
 def generate_properties(attributes: List[Union[str, Tuple[str, Any]]]):
     attributes = [
         x if isinstance(x, Tuple) else (x, None) for x in attributes
@@ -78,4 +79,3 @@ def generate_properties(attributes: List[Union[str, Tuple[str, Any]]]):
         return cls
 
     return decorator
-
diff --git a/PyTeX/tmp/pytex_path.py b/PyTeX/tmp/pytex_path.py
index 83d844e..7272ff7 100644
--- a/PyTeX/tmp/pytex_path.py
+++ b/PyTeX/tmp/pytex_path.py
@@ -1,7 +1,8 @@
+import os
 from pathlib import Path, PurePath, PurePosixPath, PureWindowsPath
+
 from PyTeX.build.build import PyTeXBuilder
 from PyTeX.build.enums.enums import PyTeXRootDirType
-import os
 
 
 class PyTeXPurePath:
diff --git a/main.py b/main.py
index b934097..b7a91c5 100644
--- a/main.py
+++ b/main.py
@@ -1,13 +1,10 @@
 from pathlib import Path
-from PyTeX.build.build import PyTeXBuilder, BuildDirConfig
+
+from PyTeX.build.build import PyTeXBuilder
 from PyTeX.build.build.build_dir_spec import BuildDirConfig
-from PyTeX.build.enums import *
-from PyTeX.build.paths import RelativePath
-
 from PyTeX.build.build.pytex_config import PyTeXConfig
-
+from PyTeX.build.paths import RelativePath
 from PyTeX.format.formatting_config import FormattingConfig
-from PyTeX.format.generic_text import GenericText
 
 spec = BuildDirConfig(
     source_root=Path('src'),
@@ -21,7 +18,6 @@ builder = PyTeXBuilder(
     build_dir_spec=spec
 )
 
-
 p: RelativePath = RelativePath(Path('src'), 'src/hello/bla')
 
 rel = p.relative_path
@@ -34,7 +30,6 @@ p2 = RelativePath(Path('doc'), 'build/doc/mkessler/hello/bla')
 
 p3 = p / p2
 
-
 p4 = p.with_name('myname')
 
 d1 = {
@@ -49,18 +44,12 @@ d2 = {
 
 d3 = d1 | d2
 
-
 config: FormattingConfig = FormattingConfig()
 
-
 dump = config.to_json()
 
-
 conf_path = Path('/home/maximilian/git/LatexPackages/.pytexrc')
 
 pytex_config = PyTeXConfig.from_yaml(conf_path)
 
 pass
-
-
-