From 7b689255bcd78529b1f4111076541097d85deb2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= Date: Wed, 9 Feb 2022 14:08:51 +0100 Subject: [PATCH] integrate git version info into formatters --- PyTeX/build/build/builder.py | 3 ++- PyTeX/build/build/pytex_file.py | 3 +++ PyTeX/format/auto_format.py | 3 +++ PyTeX/format/pytex_formatter.py | 6 +++--- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/PyTeX/build/build/builder.py b/PyTeX/build/build/builder.py index 891f31c..471d64d 100644 --- a/PyTeX/build/build/builder.py +++ b/PyTeX/build/build/builder.py @@ -162,7 +162,8 @@ class PyTeXBuilder: self.source_root, file ), - default_config=self.pytex_config.default_formatting_config + default_config=self.pytex_config.default_formatting_config, + git_version_info=self._git_version_info ) ) diff --git a/PyTeX/build/build/pytex_file.py b/PyTeX/build/build/pytex_file.py index cb4b756..46faf2a 100644 --- a/PyTeX/build/build/pytex_file.py +++ b/PyTeX/build/build/pytex_file.py @@ -7,6 +7,7 @@ from PyTeX.build.build.enums import PyTeXFileType from .hashing import md5 from ...format.formatting_config import FormattingConfig from ...format.auto_format import formatter_from_file_extension +from ...format.git_version_info import GitVersionInfo class PyTeXSourceFile: @@ -15,6 +16,7 @@ class PyTeXSourceFile: relative_path: RelativePath, formatter: Optional[FormatterIF] = None, default_config: Optional[FormattingConfig] = None, + git_version_info: Optional[GitVersionInfo] = None, pytex_file_type: Optional[PyTeXFileType] = None ): self._relative_path: RelativePath = relative_path @@ -24,6 +26,7 @@ class PyTeXSourceFile: self._formatter = formatter_from_file_extension( relative_path.path, config=default_config, + git_version_info=git_version_info, locate_file_config=True, allow_infile_config=True ) diff --git a/PyTeX/format/auto_format.py b/PyTeX/format/auto_format.py index 0f90f88..9879064 100644 --- a/PyTeX/format/auto_format.py +++ b/PyTeX/format/auto_format.py @@ -7,11 +7,13 @@ from .dict_formatter import DictFormatter from .simple_tex_formatter import SimpleTeXFormatter from .dtx_formatter import DTXFormatter from .pytex_formatter import PyTeXFormatter +from .git_version_info import GitVersionInfo def formatter_from_file_extension( input_file: Path, config: Optional[FormattingConfig] = None, + git_version_info: Optional[GitVersionInfo] = None, locate_file_config: bool = True, allow_infile_config: bool = True ) -> PyTeXFormatter: @@ -30,6 +32,7 @@ def formatter_from_file_extension( return switcher[extension]( input_file=input_file, config=config, + git_version_info=git_version_info, locate_file_config=locate_file_config, allow_infile_config=allow_infile_config ) diff --git a/PyTeX/format/pytex_formatter.py b/PyTeX/format/pytex_formatter.py index 2401ccf..46f3da4 100644 --- a/PyTeX/format/pytex_formatter.py +++ b/PyTeX/format/pytex_formatter.py @@ -5,7 +5,7 @@ from typing import Optional, Dict from .constants import * from .formatterif import FormatterIF from .formatting_config import FormattingConfig -from .git_version_info import RepoStatusInfo +from .git_version_info import GitVersionInfo from .generic_text import GenericText from ..logger import logger from abc import ABC @@ -16,7 +16,7 @@ class PyTeXFormatter(FormatterIF, ABC): self, input_file: Optional[Path] = None, config: Optional[FormattingConfig] = None, - git_version_info: Optional[RepoStatusInfo] = None, + git_version_info: Optional[GitVersionInfo] = None, locate_file_config: bool = True, allow_infile_config: bool = True ): @@ -25,7 +25,7 @@ class PyTeXFormatter(FormatterIF, ABC): config=config ) self._config: Optional[FormattingConfig] = self._config # for type-hinting - self._git_version_info: Optional[RepoStatusInfo] = git_version_info + self._git_version_info: Optional[GitVersionInfo] = git_version_info self._allow_infile_config: bool = allow_infile_config self._header: Optional[GenericText] = None if locate_file_config: