diff --git a/conda/spleeter-cpu.yaml b/conda/spleeter-cpu.yaml deleted file mode 100644 index 5137ba8..0000000 --- a/conda/spleeter-cpu.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: spleeter-cpu - -channels: - - conda-forge - - anaconda - -dependencies: - - python=3.7 - - tensorflow=1.14.0 - - ffmpeg - - pandas==0.25.1 - - requests - - pip - - pip: - - museval==0.3.0 - - musdb==0.3.1 - - norbert==0.2.1 - - spleeter - - ffmpeg-python diff --git a/conda/spleeter-gpu.yaml b/conda/spleeter-gpu.yaml deleted file mode 100644 index 094fe7d..0000000 --- a/conda/spleeter-gpu.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: spleeter-gpu - -channels: - - conda-forge - - anaconda - -dependencies: - - python=3.7 - - tensorflow-gpu=1.14.0 - - ffmpeg - - pandas==0.25.1 - - requests - - pip - - pip: - - museval==0.3.0 - - musdb==0.3.1 - - norbert==0.2.1 - - spleeter - - ffmpeg-python - diff --git a/spleeter/separator.py b/spleeter/separator.py index c161a8d..48d0b9d 100644 --- a/spleeter/separator.py +++ b/spleeter/separator.py @@ -18,7 +18,7 @@ import json from functools import partial from multiprocessing import Pool from pathlib import Path -from os.path import basename, join +from os.path import basename, join, splitext from . import SpleeterError from .audio.adapter import get_default_audio_adapter @@ -121,7 +121,7 @@ class Separator(object): duration=duration, sample_rate=self._sample_rate) sources = self.separate(waveform) - filename = basename(audio_descriptor) + filename = splitext(basename(audio_descriptor)) generated = [] for instrument, data in sources.items(): path = join(destination, filename_format.format( diff --git a/tests/test_separator.py b/tests/test_separator.py index d231987..43a1dda 100644 --- a/tests/test_separator.py +++ b/tests/test_separator.py @@ -9,7 +9,7 @@ __license__ = 'MIT License' import filecmp -from os.path import basename, exists, join +from os.path import splitext, exists, join from tempfile import TemporaryDirectory import pytest @@ -19,7 +19,7 @@ from spleeter.audio.adapter import get_default_audio_adapter from spleeter.separator import Separator TEST_AUDIO_DESCRIPTOR = 'audio_example.mp3' -TEST_AUDIO_BASENAME = basename(TEST_AUDIO_DESCRIPTOR) +TEST_AUDIO_BASENAME = splitext(TEST_AUDIO_DESCRIPTOR) TEST_CONFIGURATIONS = [ ('spleeter:2stems', ('vocals', 'accompaniment')), ('spleeter:4stems', ('vocals', 'drums', 'bass', 'other')),