From 4017216423a949ae4e417f8ad5aaf81aaed99339 Mon Sep 17 00:00:00 2001 From: romi1502 Date: Mon, 1 Mar 2021 11:54:47 +0100 Subject: [PATCH] Fixed import of importlib.metadata --- pyproject.toml | 1 + spleeter/options.py | 5 ++++- tests/test_command.py | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tests/test_command.py diff --git a/pyproject.toml b/pyproject.toml index b355a51..9cdaeb2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,6 +56,7 @@ tensorflow = "2.3.0" pandas = "1.1.2" numpy = "<1.19.0,>=1.16.0" importlib-resources = {version = "^4.1.1", python = "<3.7"} +importlib-metadata = {version = "^3.0.0", python = "<3.8"} [tool.poetry.dev-dependencies] pytest = "^6.2.1" diff --git a/spleeter/options.py b/spleeter/options.py index ee6eb33..0f27393 100644 --- a/spleeter/options.py +++ b/spleeter/options.py @@ -130,7 +130,10 @@ VerboseOption: OptionInfo = Option(False, "--verbose", help="Enable verbose logs def version_callback(value: bool): if value: - from importlib.metadata import version + try: + from importlib.metadata import version + except ImportError: + from importlib_metadata import version echo(f"Spleeter Version: {version('spleeter')}") raise Exit() diff --git a/tests/test_command.py b/tests/test_command.py new file mode 100644 index 0000000..fb97da1 --- /dev/null +++ b/tests/test_command.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +# coding: utf8 + +""" Unit testing for Separator class. """ + +__email__ = 'research@deezer.com' +__author__ = 'Deezer Research' +__license__ = 'MIT License' + +from spleeter.__main__ import spleeter +from typer.testing import CliRunner + + +def test_version(): + + runner = CliRunner() + + # execute spleeter version command + result = runner.invoke(spleeter, [ + '--version', + ]) \ No newline at end of file