From 28296c6458d02c41f7d76e395577ac7c9b1fa62a Mon Sep 17 00:00:00 2001 From: Enno Hermann Date: Thu, 27 Jun 2024 10:44:59 +0200 Subject: [PATCH] refactor: use get_git_branch from trainer --- TTS/encoder/utils/training.py | 3 +-- TTS/utils/generic_utils.py | 14 -------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/TTS/encoder/utils/training.py b/TTS/encoder/utils/training.py index 7692478d..f9088003 100644 --- a/TTS/encoder/utils/training.py +++ b/TTS/encoder/utils/training.py @@ -3,14 +3,13 @@ from dataclasses import dataclass, field from coqpit import Coqpit from trainer import TrainerArgs, get_last_checkpoint -from trainer.generic_utils import get_experiment_folder_path +from trainer.generic_utils import get_experiment_folder_path, get_git_branch from trainer.io import copy_model_files from trainer.logging import logger_factory from trainer.logging.console_logger import ConsoleLogger from TTS.config import load_config, register_config from TTS.tts.utils.text.characters import parse_symbols -from TTS.utils.generic_utils import get_git_branch @dataclass diff --git a/TTS/utils/generic_utils.py b/TTS/utils/generic_utils.py index 48c09071..b956eb11 100644 --- a/TTS/utils/generic_utils.py +++ b/TTS/utils/generic_utils.py @@ -4,7 +4,6 @@ import importlib import logging import os import re -import subprocess import sys from pathlib import Path from typing import Dict, Optional @@ -12,19 +11,6 @@ from typing import Dict, Optional logger = logging.getLogger(__name__) -# TODO: This method is duplicated in Trainer but out of date there -def get_git_branch(): - try: - out = subprocess.check_output(["git", "branch"]).decode("utf8") - current = next(line for line in out.split("\n") if line.startswith("*")) - current.replace("* ", "") - except subprocess.CalledProcessError: - current = "inside_docker" - except (FileNotFoundError, StopIteration) as e: - current = "unknown" - return current - - def to_camel(text): text = text.capitalize() text = re.sub(r"(?!^)_([a-zA-Z])", lambda m: m.group(1).upper(), text)