From f388df3129e5ba488a70e85afb426c01e12929b6 Mon Sep 17 00:00:00 2001 From: romi1502 Date: Fri, 29 Jan 2021 17:12:59 +0100 Subject: [PATCH 1/4] Added options for getting spleeter version --- spleeter/__main__.py | 7 ++++++- spleeter/options.py | 11 ++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/spleeter/__main__.py b/spleeter/__main__.py index 1f36d2e..8b5a53c 100644 --- a/spleeter/__main__.py +++ b/spleeter/__main__.py @@ -11,7 +11,6 @@ command function scope to avoid heavy import on CLI evaluation, leading to large bootstraping time. """ - import json from functools import partial from glob import glob @@ -34,6 +33,12 @@ spleeter: Typer = Typer(add_completion=False) """ CLI application. """ +@spleeter.callback() +def default( + version: bool = VersionOption, +) -> None: + pass + @spleeter.command() def train( adapter: str = AudioAdapterOption, diff --git a/spleeter/options.py b/spleeter/options.py index caf6781..a452869 100644 --- a/spleeter/options.py +++ b/spleeter/options.py @@ -6,7 +6,7 @@ from os.path import join from tempfile import gettempdir -from typer import Argument, Option +from typer import Argument, Option, echo, Exit from typer.models import ArgumentInfo, OptionInfo from .audio import Codec, STFTBackend @@ -126,3 +126,12 @@ TrainingDataDirectoryOption: OptionInfo = Option( ) VerboseOption: OptionInfo = Option(False, "--verbose", help="Enable verbose logs") + + +def version_callback(value: bool): + if value: + from importlib.metadata import version + echo(f"Spleeter Version: {version('spleeter')}") + raise Exit() + +VersionOption: OptionInfo = Option(None, "--version", callback=version_callback, is_eager=True, help="Return Spleeter version") \ No newline at end of file From 9cb23f439f22452e2ec0cf6b1cbe1df251ff06d4 Mon Sep 17 00:00:00 2001 From: romi1502 Date: Fri, 29 Jan 2021 17:23:18 +0100 Subject: [PATCH 2/4] Cleaned with black --- spleeter/__main__.py | 3 ++- spleeter/options.py | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/spleeter/__main__.py b/spleeter/__main__.py index 8b5a53c..da77b00 100644 --- a/spleeter/__main__.py +++ b/spleeter/__main__.py @@ -36,9 +36,10 @@ spleeter: Typer = Typer(add_completion=False) @spleeter.callback() def default( version: bool = VersionOption, -) -> None: +) -> None: pass + @spleeter.command() def train( adapter: str = AudioAdapterOption, diff --git a/spleeter/options.py b/spleeter/options.py index a452869..c98beb5 100644 --- a/spleeter/options.py +++ b/spleeter/options.py @@ -131,7 +131,15 @@ VerboseOption: OptionInfo = Option(False, "--verbose", help="Enable verbose logs def version_callback(value: bool): if value: from importlib.metadata import version + echo(f"Spleeter Version: {version('spleeter')}") raise Exit() -VersionOption: OptionInfo = Option(None, "--version", callback=version_callback, is_eager=True, help="Return Spleeter version") \ No newline at end of file + +VersionOption: OptionInfo = Option( + None, + "--version", + callback=version_callback, + is_eager=True, + help="Return Spleeter version", +) From 8ec8af8d4723d77b8c3eb78c1fbfd3f5dadc8b1e Mon Sep 17 00:00:00 2001 From: romi1502 Date: Fri, 29 Jan 2021 17:24:09 +0100 Subject: [PATCH 3/4] Cleaned with isort --- spleeter/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spleeter/options.py b/spleeter/options.py index c98beb5..ee6eb33 100644 --- a/spleeter/options.py +++ b/spleeter/options.py @@ -6,7 +6,7 @@ from os.path import join from tempfile import gettempdir -from typer import Argument, Option, echo, Exit +from typer import Argument, Exit, Option, echo from typer.models import ArgumentInfo, OptionInfo from .audio import Codec, STFTBackend From b0dc675acdf60eb23ffb9e7424b3b34d10dff314 Mon Sep 17 00:00:00 2001 From: romi1502 Date: Fri, 26 Feb 2021 11:44:25 +0100 Subject: [PATCH 4/4] Bump version to 2.2.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 190c9cf..b355a51 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "spleeter" -version = "2.1.2" +version = "2.2.0" description = "The Deezer source separation library with pretrained models based on tensorflow." authors = ["Deezer Research "] license = "MIT License"