diff --git a/DeepFilterNet/df/scripts/export.py b/DeepFilterNet/df/scripts/export.py index ea5afd752..a427a4a56 100644 --- a/DeepFilterNet/df/scripts/export.py +++ b/DeepFilterNet/df/scripts/export.py @@ -286,13 +286,6 @@ def export( def main(args): - try: - import monkeytype # noqa: F401 - except ImportError: - print("Failed to import monkeytype. Please install it via") - print("$ pip install MonkeyType") - exit(1) - print(args) model, df_state, _, epoch = init_df( args.model_base_dir, diff --git a/DeepFilterNet/df/utils.py b/DeepFilterNet/df/utils.py index cea7a9b3e..0f86b8201 100644 --- a/DeepFilterNet/df/utils.py +++ b/DeepFilterNet/df/utils.py @@ -142,7 +142,9 @@ def get_git_root(): git_local_dir = os.path.dirname(os.path.abspath(__file__)) args = ["git", "-C", git_local_dir, "rev-parse", "--show-toplevel"] return subprocess.check_output(args).strip().decode() - except subprocess.CalledProcessError: + except (subprocess.CalledProcessError, OSError): + # CalledProcessError: not inside a repository. + # OSError (FileNotFoundError): git is not installed at all. return None @@ -154,8 +156,8 @@ def get_commit_hash(): return None args = ["git", "-C", git_dir, "rev-parse", "--short", "--verify", "HEAD"] return subprocess.check_output(args).strip().decode() - except subprocess.CalledProcessError: - # probably not in git repo + except (subprocess.CalledProcessError, OSError): + # not in a git repo, or git is not installed return None @@ -168,8 +170,8 @@ def get_branch_name(): git_dir = os.path.dirname(os.path.abspath(__file__)) args = ["git", "-C", git_dir, "rev-parse", "--abbrev-ref", "HEAD"] branch = subprocess.check_output(args).strip().decode() - except subprocess.CalledProcessError: - # probably not in git repo + except (subprocess.CalledProcessError, OSError): + # not in a git repo, or git is not installed branch = None return branch